Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseWorkshopInfoServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.mes.service.impl;
 
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -118,6 +119,16 @@ public class ProdBaseWorkshopInfoServiceImpl implements IProdBaseWorkshopInfoSer
      */
     private void validEntityBeforeSave(ProdBaseWorkshopInfo entity) {
         //TODO 做一些数据校验,如唯一约束
+        // 校验编码是否重复
+        if (StringUtils.isNotBlank(entity.getWorkshopCode())) {
+            ProdBaseWorkshopInfoBo query = new ProdBaseWorkshopInfoBo();
+            query.setWorkshopCode(entity.getWorkshopCode());
+            MPJLambdaWrapper<ProdBaseWorkshopInfo> lqw = buildQueryWrapper(query);
+            ProdBaseWorkshopInfo prodBaseWorkshopInfo =  baseMapper.selectOne(lqw);
+            if (prodBaseWorkshopInfo != null && !prodBaseWorkshopInfo.getWorkshopId().equals(entity.getWorkshopId())) {
+                throw new ServiceException("编码已存在");
+            }
+        }
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMasterDataDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -86,7 +87,7 @@ public class SysMasterDataDetailServiceImpl implements ISysMasterDataDetailServi
         .eq(StringUtils.isNotBlank(bo.getFieldData5()), SysMasterDataDetail::getFieldData5, bo.getFieldData5())
         .eq(bo.getDisplaySort() != null, SysMasterDataDetail::getDisplaySort, bo.getDisplaySort())
         .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysMasterDataDetail::getActiveFlag, bo.getActiveFlag())
-        .orderByDesc(SysMasterDataDetail::getCreateTime);
+        .orderByAsc(SysMasterDataDetail::getDataDetailCode);
         return lqw;
     }
 
@@ -125,6 +126,15 @@ public class SysMasterDataDetailServiceImpl implements ISysMasterDataDetailServi
      */
     private void validEntityBeforeSave(SysMasterDataDetail entity){
         //TODO 做一些数据校验,如唯一约束
+        //编号校验
+        SysMasterDataDetailBo detailBo = new SysMasterDataDetailBo();
+        detailBo.setMasterDataId(entity.getMasterDataId());
+        detailBo.setDataDetailCode(entity.getDataDetailCode());
+        MPJLambdaWrapper<SysMasterDataDetail> lqw = buildQueryWrapper(detailBo);
+        SysMasterDataDetail detail = baseMapper.selectOne(lqw);
+        if (StringUtils.isNotNull(detail) && !entity.getMasterDataDetailId().equals(detail.getMasterDataDetailId())){
+            throw new ServiceException("编码已存在");
+        }
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMasterDataServiceImpl.java

@@ -77,7 +77,7 @@ public class SysMasterDataServiceImpl implements ISysMasterDataService {
         .eq(StringUtils.isNotBlank(bo.getModuleType()), SysMasterData::getModuleType, bo.getModuleType())
         .eq(StringUtils.isNotBlank(bo.getParentFlag()), SysMasterData::getParentFlag, bo.getParentFlag())
         .eq(bo.getMenuId() != null, SysMasterData::getMenuId, bo.getMenuId())
-        .eq(StringUtils.isNotBlank(bo.getQueryParam()), SysMasterData::getQueryParam, bo.getQueryParam())
+        .like(StringUtils.isNotBlank(bo.getQueryParam()), SysMasterData::getQueryParam, bo.getQueryParam())
         .eq(StringUtils.isNotBlank(bo.getMasterDataTitle()), SysMasterData::getMasterDataTitle, bo.getMasterDataTitle())
         .eq(StringUtils.isNotBlank(bo.getFieldName1()), SysMasterData::getFieldName1, bo.getFieldName1())
         .eq(StringUtils.isNotBlank(bo.getDisplayFlag1()), SysMasterData::getDisplayFlag1, bo.getDisplayFlag1())
@@ -90,7 +90,7 @@ public class SysMasterDataServiceImpl implements ISysMasterDataService {
         .eq(StringUtils.isNotBlank(bo.getFieldName5()), SysMasterData::getFieldName5, bo.getFieldName5())
         .eq(StringUtils.isNotBlank(bo.getDisplayFlag5()), SysMasterData::getDisplayFlag5, bo.getDisplayFlag5())
         .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysMasterData::getActiveFlag, bo.getActiveFlag())
-        .orderByDesc(SysMasterData::getCreateTime);
+        .orderByAsc(SysMasterData::getCreateTime);
         return lqw;
     }