Bladeren bron

用户信息新增-查询员工信息

hanqingsong 1 jaar geleden
bovenliggende
commit
aac0063b58

+ 2 - 1
src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -67,7 +67,8 @@ public class DatePermissionInterceptor implements Interceptor {
67
 	    		!"com.chinaitop.depot.system.mapper.OrgInfoMapper.getAllDepotInfo".equals(mappedStatement.getId()) &&
67
 	    		!"com.chinaitop.depot.system.mapper.OrgInfoMapper.getAllDepotInfo".equals(mappedStatement.getId()) &&
68
 	    		!"com.chinaitop.depot.system.mapper.OrgInfoMapper.getOrgLevel".equals(mappedStatement.getId()) && 
68
 	    		!"com.chinaitop.depot.system.mapper.OrgInfoMapper.getOrgLevel".equals(mappedStatement.getId()) && 
69
 	    		!"com.chinaitop.depot.system.mapper.UserInfoMapper.selectByExampleNoDatePermission".equals(mappedStatement.getId()) &&
69
 	    		!"com.chinaitop.depot.system.mapper.UserInfoMapper.selectByExampleNoDatePermission".equals(mappedStatement.getId()) &&
70
-	    		!"com.chinaitop.depot.system.mapper.RoleInfoMapper.getRoleTreeByOrg".equals(mappedStatement.getId())
70
+	    		!"com.chinaitop.depot.system.mapper.RoleInfoMapper.getRoleTreeByOrg".equals(mappedStatement.getId()) &&
71
+				!"com.chinaitop.depot.system.mapper.UserInfoMapper.getBySfzhm".equals(mappedStatement.getId())
71
 	    		) {
72
 	    		) {
72
 			//通过本地线程获取库id
73
 			//通过本地线程获取库id
73
 			Object threadLocalObj = DataPolicyEngine.get();
74
 			Object threadLocalObj = DataPolicyEngine.get();

+ 7 - 4
src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -22,10 +22,7 @@ import org.apache.commons.lang3.StringUtils;
22
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.beans.factory.annotation.Autowired;
23
 import org.springframework.beans.factory.annotation.Value;
23
 import org.springframework.beans.factory.annotation.Value;
24
 import org.springframework.http.MediaType;
24
 import org.springframework.http.MediaType;
25
-import org.springframework.web.bind.annotation.RequestMapping;
26
-import org.springframework.web.bind.annotation.RequestMethod;
27
-import org.springframework.web.bind.annotation.RequestParam;
28
-import org.springframework.web.bind.annotation.RestController;
25
+import org.springframework.web.bind.annotation.*;
29
 
26
 
30
 import com.alibaba.fastjson.JSONArray;
27
 import com.alibaba.fastjson.JSONArray;
31
 import com.alibaba.fastjson.JSONObject;
28
 import com.alibaba.fastjson.JSONObject;
@@ -1054,4 +1051,10 @@ public class UserInfoController {
1054
 		}
1051
 		}
1055
 		return flag;
1052
 		return flag;
1056
 	}
1053
 	}
1054
+
1055
+	@GetMapping("/getBySfzhm/{sfzhm}/{orgId}")
1056
+	@ApiOperation(value="查询员工信息详情", notes = "身份证号和orgId")
1057
+	public UserInfo getBySfzhm(@PathVariable("sfzhm") String sfzhm,@PathVariable("orgId") Integer orgId) {
1058
+		return userInfoService.getBySfzhm(sfzhm, orgId);
1059
+	}
1057
 }
1060
 }

+ 2 - 0
src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.java

@@ -74,4 +74,6 @@ public interface UserInfoMapper {
74
 	 * @return
74
 	 * @return
75
 	 */
75
 	 */
76
 	List<String> selectPwdBlack(String pwd);
76
 	List<String> selectPwdBlack(String pwd);
77
+
78
+    UserInfo getBySfzhm(@Param("sfzhm") String sfzhm, @Param("orgId") Integer orgId);
77
 }
79
 }

+ 14 - 0
src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -794,5 +794,19 @@
794
   <select id="selectPwdBlack" parameterType="java.lang.String" resultType="java.util.Map">
794
   <select id="selectPwdBlack" parameterType="java.lang.String" resultType="java.util.Map">
795
 	select pwd from dict_pwd_blacklist where INSTR(#{pwd,jdbcType=VARCHAR}, pwd) > 0
795
 	select pwd from dict_pwd_blacklist where INSTR(#{pwd,jdbcType=VARCHAR}, pwd) > 0
796
   </select>
796
   </select>
797
+    <select id="getBySfzhm" parameterType="object" resultType="com.chinaitop.depot.system.model.UserInfo">
798
+        select
799
+            ry.ryxm realName,
800
+            ry.bmmc bmmc,
801
+            oi.org_id orgId,
802
+            ry.lxdh mobile,
803
+            ry.avatorUrl imgUrl
804
+        from
805
+            base:d_ryxxsjy ry
806
+        left join base:d_kdxxsjy kd on ry.kddm = kd.kddm
807
+        inner join org_info oi on kd.kqdm = oi.kqbm
808
+        where ry.sfzh = #{sfzhm}
809
+        and oi.org_id = #{orgId}
810
+    </select>
797
   
811
   
798
 </mapper>
812
 </mapper>

+ 2 - 0
src/main/java/com/chinaitop/depot/system/service/UserInfoService.java

@@ -152,4 +152,6 @@ public interface UserInfoService {
152
 	 * @throws Exception
152
 	 * @throws Exception
153
 	 */
153
 	 */
154
 	boolean checkPwdBlack(String pwd) throws Exception;
154
 	boolean checkPwdBlack(String pwd) throws Exception;
155
+
156
+    UserInfo getBySfzhm(String sfzhm, Integer orgId);
155
 }
157
 }

+ 5 - 0
src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -356,4 +356,9 @@ public class UserInfoServiceImpl implements UserInfoService {
356
 		return flag;
356
 		return flag;
357
 	}
357
 	}
358
 
358
 
359
+    @Override
360
+    public UserInfo getBySfzhm(String sfzhm, Integer orgId) {
361
+        return UserInfoMapper.getBySfzhm(sfzhm, orgId);
362
+    }
363
+
359
 }
364
 }

+ 3 - 0
src/main/resources/mybatis/mybatis-config.xml

@@ -3,6 +3,9 @@
3
 	PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
3
 	PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
4
     "http://mybatis.org/dtd/mybatis-3-config.dtd">
4
     "http://mybatis.org/dtd/mybatis-3-config.dtd">
5
 <configuration>
5
 <configuration>
6
+	<typeHandlers>
7
+		<typeHandler handler="org.apache.ibatis.type.StringTypeHandler" jdbcType="LONGVARCHAR" javaType="string"/>
8
+	</typeHandlers>
6
 	<plugins>
9
 	<plugins>
7
   			<plugin interceptor="com.github.pagehelper.PageInterceptor">
10
   			<plugin interceptor="com.github.pagehelper.PageInterceptor">
8
   				<property name="helperDialect" value="informix" />
11
   				<property name="helperDialect" value="informix" />