优化代码

928255095 · 928255095 · commit 26db11c1beed · 2020-09-20T10:48:10.000+08:00
diff --git a/java110-bean/src/main/java/com/java110/dto/userLogin/UserLoginDto.java b/java110-bean/src/main/java/com/java110/dto/userLogin/UserLoginDto.java
@@ -24,6 +24,8 @@ public class UserLoginDto extends PageDto implements Serializable {
     private String userName;
     private String userId;
     private String token;
+    private String parentOrgName;
+    private String orgName;
 
 
     private Date createTime;
@@ -103,4 +105,20 @@ public String getStatusCd() {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getParentOrgName() {
+        return parentOrgName;
+    }
+
+    public void setParentOrgName(String parentOrgName) {
+        this.parentOrgName = parentOrgName;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
 }
diff --git a/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
@@ -18,9 +18,19 @@
     <!-- 查询用户登录信息 add by wuxw 2018-07-03 -->
     <select id="getUserLoginInfo" parameterType="Map" resultType="Map">
         select t.password,t.login_id,t.login_id loginId,t.login_time,t.login_time
-        loginTime,t.source,t.user_name,t.user_name userName,t.user_id,t.user_id userId,t.token
+        loginTime,t.source,t.user_name,t.user_name userName,t.user_id,t.user_id userId,t.token,
+        puo.org_id parentOrgId,puo.org_name parentOrgName,uo.org_name orgName
         from u_user_login t
+        left join u_org_staff_rel uosr on t.user_id = uosr.staff_id and uosr.status_cd = '0'
+        left join u_org uo on uosr.org_id = uo.org_id  and uo.status_cd = '0'
+        left join u_org puo on uo.parent_org_id = puo.org_id and puo.status_cd = '0'
         where 1 =1
+        <if test="parentOrgName !=null and parentOrgName != ''">
+            and puo.org_name= #{parentOrgName}
+        </if>
+        <if test="orgName !=null and orgName != ''">
+            and uo.org_name= #{orgName}
+        </if>
         <if test="password !=null and password != ''">
             and t.password= #{password}
         </if>
diff --git a/service-user/src/main/java/com/java110/user/api/UserLoginApi.java b/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
@@ -100,13 +100,17 @@ public ResponseEntity<String> deleteUserLogin(@RequestBody JSONObject reqJson) {
      * @path /app/userLogin/queryUserLogin
      */
     @RequestMapping(value = "/queryUserLogin", method = RequestMethod.GET)
-    public ResponseEntity<String> queryUserLogin(@RequestParam(value = "userName") String userName,
+    public ResponseEntity<String> queryUserLogin(@RequestParam(value = "userName",required = false) String userName,
+                                                 @RequestParam(value = "parentOrgName",required = false) String parentOrgName,
+                                                 @RequestParam(value = "orgName",required = false) String orgName,
                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row) {
         UserLoginDto userLoginDto = new UserLoginDto();
         userLoginDto.setPage(page);
         userLoginDto.setRow(row);
         userLoginDto.setUserName(userName);
+        userLoginDto.setParentOrgName(parentOrgName);
+        userLoginDto.setOrgName(orgName);
         return getUserLoginBMOImpl.get(userLoginDto);
     }
 }
