Merge branch 'develop_master' into 'FOTON'
Develop master See merge request LiuChao/foton-slrs-system-rest!344
This commit is contained in:
@@ -97,7 +97,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
|
|||||||
@Override
|
@Override
|
||||||
public Integer saveDictype(DicTypeEO dicTypeEO){
|
public Integer saveDictype(DicTypeEO dicTypeEO){
|
||||||
// 此处存在问题, 当当前参数为标准类别时需要输入的code为name值
|
// 此处存在问题, 当当前参数为标准类别时需要输入的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())){
|
if(!StringUtils.isNotEmpty(dicTypeEO.getDicTypeCode())){
|
||||||
dicTypeEO.setDicTypeCode(UUIDUtils.randomUUID10());
|
dicTypeEO.setDicTypeCode(UUIDUtils.randomUUID10());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user