Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java

@@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-        return Result.success(dicTypeEO);
+
+        return Result.success("1","hello");
+//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+//        return Result.success(dicTypeEO);
     }
 
     /**

adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java

@@ -97,7 +97,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
     @Override
     public Integer saveDictype(DicTypeEO dicTypeEO){
         // 此处存在问题， 当当前参数为标准类别时需要输入的code为name值
-        if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId())){
+        if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId()) && !"NGETEMDJDI".equals(dicTypeEO.getDicId()) ){
             if(!StringUtils.isNotEmpty(dicTypeEO.getDicTypeCode())){
                 dicTypeEO.setDicTypeCode(UUIDUtils.randomUUID10());
             }