Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!344
2021-12-30 19:32:47 +08:00
parent 5d66ea8b92 c699e92f94
commit eba2ea008a
1 changed files with 1 additions and 1 deletions
@@ -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());
            }