update 标签管理处理字典code

laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java

@@ -9,6 +9,8 @@ import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.enums.FixedFieldEnum;
+import com.jero.modules.system.entity.SysDict;
+import com.jero.modules.system.mapper.SysDictMapper;
 import com.jero.modules.tag.entity.LawsTag;
 import com.jero.modules.tag.enums.TableNameEnum;
 import com.jero.modules.tag.service.ILawsTagService;
@@ -22,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
@@ -40,9 +43,10 @@ import java.util.Objects;
 @RequestMapping("/tag/lawsTag")
 @Slf4j
 public class LawsTagController extends JeroController<LawsTag, ILawsTagService> {
-	@Autowired
+	@Resource
 	private ILawsTagService lawsTagService;
-
+	@Resource
+	private SysDictMapper dictMapper;
 	//@Autowired
 	//private OnlCgformApiController onlCgformApiController;
 	/**
@@ -92,7 +96,11 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 		//查询同一模块下,同名数据
 		queryWrapper.eq("db_field_txt", lawsTag.getDbFieldTxt()).eq("is_model", lawsTag.getIsModel());
 		List<LawsTag> existCgformTagList = this.lawsTagService.list(queryWrapper);
-
+		String dictId = lawsTag.getDictId();
+		if (StringUtils.isNotBlank(dictId)){
+			SysDict sysDict = dictMapper.selectById(dictId);
+			lawsTag.setDictField(sysDict.getDictCode());
+		}
 		if(!existCgformTagList.isEmpty()){
 			LawsTag lawsTagDB =  existCgformTagList.get(0);
 			//存在重复同名标签,且已删
@@ -158,6 +166,11 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 					.eq("is_model", isModel)
 					.last("limit 1");
 			LawsTag lawsTagOld = lawsTagService.getOne(queryWrapper);
+			String dictId = lawsTag.getDictId();
+			if (StringUtils.isNotBlank(dictId)){
+				SysDict sysDict = dictMapper.selectById(dictId);
+				lawsTag.setDictField(sysDict.getDictCode());
+			}
 			//有同名数据
 			if(lawsTagOld != null) {
 				//已存在同名的数据,就是正在编辑的这个