专家新增、修改

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseExpertController.java

@@ -17,6 +17,7 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.system.domain.vo.SysRegionVO;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.SysRegionService;
 import io.swagger.annotations.Api;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
 import java.util.Arrays;
 import java.util.Date;
@@ -54,8 +56,10 @@ public class BaseExpertController extends BaseController {
     private BaseProfessionalService baseProfessionalService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Resource
+    private SysRegionService sysRegionService;
 
-    @ApiOperation(value = "新增专家库", notes = "必传 专家库名称")
+    @ApiOperation(value = "新增专家库" , notes = "必传 专家库名称")
     @PostMapping("/insertExpert")
     @PreAuthorize("@ss.hasPermi('base:expert:insertExpert')")
     @Log(title = ModularConstans.expert, businessType = BusinessType.INSERT)
@@ -82,6 +86,10 @@ public class BaseExpertController extends BaseController {
         if (!ObjectUtils.isEmpty(list1) && list1.size() > 0) {
             return error("身份证号已经存在");
         }
+        SysRegionVO sysRegionVO = sysRegionService.selectInfoByCode(baseExpertVo.getLocalArea());
+        if (ObjectUtils.isEmpty(sysRegionVO)) {
+            return error("该区域在数据库中不存在");
+        }
         return toAjax(baseExpertService.insertExpert(baseExpertVo));
     }
 
@@ -124,6 +132,10 @@ public class BaseExpertController extends BaseController {
                 return error("身份证号已经存在");
             }
         }
+        SysRegionVO sysRegionVO = sysRegionService.selectInfoByCode(baseExpert.getLocalArea());
+        if (ObjectUtils.isEmpty(sysRegionVO)) {
+            return error("该区域在数据库中不存在");
+        }
         return toAjax(baseExpertService.updateById(baseExpert));
     }
 

purchase-system/src/main/java/com/ozs/system/mapper/SysRegionMapper.java

@@ -13,4 +13,7 @@ import java.util.List;
 @Mapper
 public interface SysRegionMapper extends BaseMapper<SysRegion> {
     List<SysRegionVO> findChildDivisions(@Param("pcode") String pcode);
+
+
+    SysRegionVO selectInfoByCode(@Param("code") String code);
 }

purchase-system/src/main/java/com/ozs/system/service/ISysRegionService.java

@@ -9,10 +9,11 @@ import java.util.List;
 
 
 /**
- *
  * @author makejava
  * @since 2021-05-21 00:08:38
  */
 public interface ISysRegionService extends IService<SysRegion> {
     List<SysRegionVO> findChildDivisions(String pCode);
+
+    SysRegionVO selectInfoByCode(String code);
 }

purchase-system/src/main/java/com/ozs/system/service/SysRegionService.java

@@ -129,13 +129,16 @@ public class SysRegionService {
 
     private String getParentAdministrativeDivisionName(Long pid,String pAdministrativeDivisionName) {
         SysRegion parent = this.gtAdministrativeDivisionService.getById(pid);
-        if(parent != null && 0 != parent.getLevel()){
+        if (parent != null && 0 != parent.getLevel()) {
             pAdministrativeDivisionName = parent.getAdministrativeDivision() + "/" + pAdministrativeDivisionName;
-            pAdministrativeDivisionName = getParentAdministrativeDivisionName(parent.getPid(),pAdministrativeDivisionName);
+            pAdministrativeDivisionName = getParentAdministrativeDivisionName(parent.getPid(), pAdministrativeDivisionName);
         }
 
         return pAdministrativeDivisionName;
     }
 
 
+    public SysRegionVO selectInfoByCode(String code) {
+        return gtAdministrativeDivisionService.selectInfoByCode(code);
+    }
 }

purchase-system/src/main/java/com/ozs/system/service/impl/SysRegionServiceImpl.java

@@ -12,7 +12,12 @@ import java.util.List;
 @Service
 public class SysRegionServiceImpl extends ServiceImpl<SysRegionMapper, SysRegion> implements ISysRegionService {
     @Override
-    public List<SysRegionVO> findChildDivisions(String pcode){
+    public List<SysRegionVO> findChildDivisions(String pcode) {
         return this.baseMapper.findChildDivisions(pcode);
     }
+
+    @Override
+    public SysRegionVO selectInfoByCode(String code) {
+        return this.baseMapper.selectInfoByCode(code);
+    }
 }

purchase-system/src/main/resources/mapper/system/SysRegionMapper.xml

@@ -11,13 +11,19 @@
         <collection property="children"
                     ofType="com.ozs.system.domain.vo.SysRegionVO"
                     select="findChildDivisions"
-                    column="code" />
+                    column="code"/>
     </resultMap>
 
     <select id="findChildDivisions" resultMap="divisionList">
-        SELECT  m.id,m.administrative_division,m.pid,m.code,m.level
+        SELECT m.id, m.administrative_division, m.pid, m.code, m.level
         FROM sys_region m
-        WHERE pid= (select n.id from sys_region n where n.code = #{pcode})
+        WHERE pid = (select n.id from sys_region n where n.code = #{pcode})
+    </select>
+
+    <select id="selectInfoByCode" resultType="com.ozs.system.domain.vo.SysRegionVO">
+        SELECT m.id, m.administrative_division as administrativeDivision, m.pid, m.code, m.level
+        FROM sys_region m
+        WHERE code = #{code}
     </select>
 
 </mapper>