人员添加查询条件

src/main/java/com/chinaitop/depot/basic/controller/DRyxxsjyController.java

@@ -42,10 +42,10 @@ public class DRyxxsjyController {
         return new PageInfo<>(dRyxxsjyService.getPageList(pageParam));
     }
 
-    @GetMapping("/getById/{rybh}")
-    @ApiOperation(value="查询员工信息详情", notes = "rybh")
-    public DRyxxsjyVO getById(@PathVariable("rybh") String rybh) {
-        return dRyxxsjyService.getById(rybh);
+    @GetMapping("/getById/{rybh}/{orgId}")
+    @ApiOperation(value="查询员工信息详情", notes = "rybh和orgId")
+    public DRyxxsjyVO getById(@PathVariable("rybh") String rybh, @PathVariable("orgId") Integer orgId) {
+        return dRyxxsjyService.getById(rybh, orgId);
     }
 
 }

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface DRyxxsjyMapper {
     List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam);
 
-    DRyxxsjyVO getById(String rybh);
+    DRyxxsjyVO getById(@Param("rybh") String rybh, @Param("orgId") Integer orgId);
 
     List<EducationVO> getQuanById(String rybh);
 

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.xml

@@ -24,7 +24,7 @@
         order by
             ry.RYBH desc
     </select>
-    <select id="getById" parameterType="string" resultType="com.chinaitop.depot.basic.model.DRyxxsjyVO">
+    <select id="getById" parameterType="object" resultType="com.chinaitop.depot.basic.model.DRyxxsjyVO">
         select
            ry.sfzh,
            ry.ryxm,
@@ -50,8 +50,9 @@
            ry.ryfj
         from
             base:d_ryxxsjy ry
-        left join base:d_ryzwlxb zwlx on zwlx.rysfzh = ry.sfzh and zwlx.qymc = ry.qymc
-        where ry.rybh = #{rybh}
+        left join base:d_ryzwlxb zwlx on zwlx.rysfzh = ry.sfzh
+        left join org_info oi on zwlx.tyshxydm = oi.credit_code
+        where ry.rybh = #{rybh} and and oi.org_id = #{orgId}
     </select>
     <select id="getQuanById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.EducationVO">
         select

src/main/java/com/chinaitop/depot/basic/service/DRyxxsjyService.java

@@ -13,5 +13,5 @@ import java.util.List;
 public interface DRyxxsjyService {
     List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam);
 
-    DRyxxsjyVO getById(String rybh);
+    DRyxxsjyVO getById(String rybh, Integer orgId);
 }

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -39,8 +39,8 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
     }
 
     @Override
-    public DRyxxsjyVO getById(String rybh) {
-        DRyxxsjyVO dRyxxsjyVO = dRyxxsjyMapper.getById(rybh);
+    public DRyxxsjyVO getById(String rybh, Integer orgId) {
+        DRyxxsjyVO dRyxxsjyVO = dRyxxsjyMapper.getById(rybh, orgId);
         if (ObjectUtils.isEmpty(dRyxxsjyVO)) {
             return dRyxxsjyVO;
         }