修改bug:20231202

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/AppServiceImpl.java

@@ -48,6 +48,7 @@ public class AppServiceImpl implements AppService {
         //判断是否存在该商户
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("commercial_id",appVo.getCommercialId());
+        queryWrapper.eq("state",1);
         Long aLong = commercialMapper.selectCount(queryWrapper);
         if (aLong > 0){
             App app = new App(appVo);
@@ -170,6 +171,7 @@ public class AppServiceImpl implements AppService {
     public List<Commercial> getCommercialList() {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("commercial_id","commercial_name");
+        queryWrapper.eq("state",1);
         List<Commercial> commercials = commercialMapper.selectList(queryWrapper);
         return commercials;
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -73,7 +73,7 @@ public class CommercialServiceImpl implements CommericalService {
     public HashMap getCommercialList(CommercialVo commercialVo) {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         if(commercialVo.getSearchText() != null && !commercialVo.getSearchText().equals("")){
-            queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
+            //queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
             queryWrapper.or().like("commercial_name",commercialVo.getSearchText());
             queryWrapper.or().like("principal_name",commercialVo.getSearchText());
             queryWrapper.or().likeRight("principal_telephone",commercialVo.getSearchText());

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -100,9 +100,6 @@ public class EquipmentServiceImpl implements EquipmentService {
         Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
         if (equipment != null){
-            if (!equipmentVo.getAddrCode().equals(equipment.getAddrCode()))
-                equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));  //更新地区码映射
-
             String state = "";
             if (equipmentVo.getOnState() != equipment.getOnState()){
                 if (equipmentVo.getOnState() == 1){