Merge branch 'dev-20241121' of depot-tianjin/depot-system-tianjin into master

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

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

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -22,10 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -249,10 +246,10 @@ public class UserInfoController {
 	@RequestMapping(value="/login", method = RequestMethod.POST)
 	@ApiOperation(value="用户登录", notes = "用户登录")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "username", value = "用户名", paramType = "form"),
-			@ApiImplicitParam(name = "password", value = "密码", paramType = "form"),
-			@ApiImplicitParam(name = "yzm", value = "验证码", paramType = "form"),
-			@ApiImplicitParam(name = "from", value = "来源，app代表来自于移动端", paramType = "form")
+			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
+			@ApiImplicitParam(name = "password", value = "密码", paramType = "query"),
+			@ApiImplicitParam(name = "yzm", value = "验证码", paramType = "query"),
+			@ApiImplicitParam(name = "from", value = "来源，app代表来自于移动端", paramType = "query")
 	})
 	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -299,7 +296,15 @@ public class UserInfoController {
 				map.put("success", "手机验证码错误或者已过期！");
 				return map;
 			}*/
-			
+
+			// 判断是否启用(离职状态)
+			String zgzt = userInfo.getZgzt();
+			if ("02".equals(zgzt)) {
+				map.put("status", false);
+				map.put("success", "该用户名为离职状态！");
+				return map;
+			}
+
 			int limitTime = Integer.parseInt(loginTime);
 			/**************************用户登录失败处理功能，限制用户非法登录次数************************/
 			if(userInfo == null) {//密码输入错误
@@ -1054,4 +1059,10 @@ public class UserInfoController {
 		}
 		return flag;
 	}
+
+	@GetMapping("/getBySfzhm/{sfzhm}/{orgId}")
+	@ApiOperation(value="查询员工信息详情", notes = "身份证号和orgId")
+	public UserInfo getBySfzhm(@PathVariable("sfzhm") String sfzhm,@PathVariable("orgId") Integer orgId) {
+		return userInfoService.getBySfzhm(sfzhm, orgId);
+	}
 }

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.java

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

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -794,5 +794,20 @@
   <select id="selectPwdBlack" parameterType="java.lang.String" resultType="java.util.Map">
 	select pwd from dict_pwd_blacklist where INSTR(#{pwd,jdbcType=VARCHAR}, pwd) > 0
   </select>
+    <select id="getBySfzhm" parameterType="object" resultType="com.chinaitop.depot.system.model.UserInfo">
+        select
+            ry.sfzh sfzhm,
+            ry.ryxm realName,
+            ry.bmmc bmmc,
+            oi.org_id orgId,
+            ry.lxdh mobile,
+            ry.avatorUrl imgUrl
+        from
+            base:d_ryxxsjy ry
+        left join base:d_kdxxsjy kd on ry.kddm = kd.kddm
+        inner join org_info oi on kd.kqdm = oi.kqbm
+        where ry.sfzh = #{sfzhm}
+        and oi.org_id = #{orgId}
+    </select>
   
 </mapper>

src/main/java/com/chinaitop/depot/system/service/UserInfoService.java

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

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -356,4 +356,9 @@ public class UserInfoServiceImpl implements UserInfoService {
 		return flag;
 	}
 
+    @Override
+    public UserInfo getBySfzhm(String sfzhm, Integer orgId) {
+        return UserInfoMapper.getBySfzhm(sfzhm, orgId);
+    }
+
 }

src/main/resources/mybatis/mybatis-config.xml

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