修復

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -148,6 +148,7 @@ public class KeyPwdController extends BladeController {
 		}
 
 		keyPwd.setIsTurnIn(0); //未上缴的
+		keyPwd.setProcess(3);
 		List<KeyPwd> list = keyPwdService.getList(keyPwd);
 		HashSet<Map> set = new HashSet<>();
 		for (int i = 0; i < list.size(); i++) {
@@ -224,7 +225,7 @@ public class KeyPwdController extends BladeController {
 		User user = userService.getById(currentUser.getUserId());
 		Dept dept = deptService.getById(user.getDeptId());
 		UserLog userLog = new UserLog();
-		Assert.isTrue(!keyPwd.getReceiverNo().equals(keyPwd.getHandoverPersonNo()), "交出人不可為接收人！請重新選擇！");
+		Assert.isTrue(!keyPwd.getHandoverPersonNo().equals(keyPwd.getReceiverNo()), "交出人不可為接收人！請重新選擇！");
 
 		KeyPwd old = null;
 		if (isAdd){

src/main/java/org/springblade/bank/keypwd/mapper/KeyPwdMapper.xml

@@ -66,6 +66,9 @@
             <if test="keyPwd.isTurnIn!=null">
                 AND c.is_turn_in = '${keyPwd.isTurnIn}'
             </if>
+            <if test="keyPwd.process!=null">
+                AND c.process = '${keyPwd.process}'
+            </if>
             <if test="keyPwd.category!=null">
                 AND c.category in
                 <foreach item="category" collection="keyPwd.categorys" separator="," open="(" close=")" index="">

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -129,6 +129,13 @@ public class SealHandoverController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入sealHandover")
 	public R<List<SealHandoverVO>> getKeepList(SealHandoverVO sealHandover) {
+
+		Long deptId = Long.valueOf(AuthUtil.getDeptId());
+		List<Long> deptChildIds = deptService.getDeptChildIds(deptId);
+		deptChildIds.add(deptId);
+		sealHandover.setDeptIdList(deptChildIds);
+		sealHandover.setCurrentuserId(AuthUtil.getUserId());
+
 		if (StringUtils.isNotBlank(sealHandover.getSealType())){
 			List<String> sealTypes = Func.toStrList(sealHandover.getSealType());
 			sealHandover.setSealTypes(sealTypes);
@@ -138,6 +145,8 @@ public class SealHandoverController extends BladeController {
 			sealHandover.setOrgNos(orgNos);
 		}
 
+		sealHandover.setProcess(3);
+		sealHandover.setIsTurnIn(0);
 		List<SealHandoverVO> list = sealHandoverService.getList(sealHandover);
 		List<SealHandover> turnInList = sealHandoverService.getTurnInList();
 

src/main/java/org/springblade/bank/sealhandover/mapper/SealHandoverMapper.java

@@ -41,10 +41,10 @@ public interface SealHandoverMapper extends BaseMapper<SealHandover> {
 	 * @param sealHandover
 	 * @return
 	 */
-	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
+//	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
 	List<SealHandoverVO> selectSealHandoverPage(IPage page, SealHandoverVO sealHandover);
 
-	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
+//	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
 	List<SealHandoverVO> selectSealHandoverPage(@Param("sealHandover") SealHandoverVO sealHandover);
 
 	List<SealHandoverVO> selectMySealHandoverPage(IPage<SealHandoverVO> page, SealHandoverVO sealHandover);

src/main/java/org/springblade/bank/sealhandover/service/impl/SealHandoverServiceImpl.java

@@ -42,7 +42,7 @@ public class SealHandoverServiceImpl extends BaseServiceImpl<SealHandoverMapper,
 
 	@Override
 	public IPage<SealHandoverVO> selectSealHandoverPage(IPage<SealHandoverVO> page, SealHandoverVO sealHandover) {
-		return page.setRecords(baseMapper.selectMySealHandoverPage(page, sealHandover));
+		return page.setRecords(baseMapper.selectSealHandoverPage(page, sealHandover));
 	}
 
 	@Override

src/main/java/org/springblade/common/utils/hangxin/HangxinUtil.java

@@ -35,7 +35,7 @@ public class HangxinUtil {
 
 		Map<String, Object> params = new HashMap<>();
 		params.put("touser", StringUtil.join(userIds, "|"));
-		params.put("sysId", hangxinConfig.getSysId());
+		params.put("sysid", hangxinConfig.getSysid());
 		params.put("title", title);
 		params.put("content", content);
 

src/main/java/org/springblade/common/utils/hangxin/conf/HangxinConfig.java

@@ -10,7 +10,7 @@ public class HangxinConfig {
 
 	@Value("${hangxin.url}")
 	private String url;
-	@Value("${hangxin.sysId}")
-	private String sysId;
+	@Value("${hangxin.sysid}")
+	private String sysid;
 
 }

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -570,7 +570,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public IPage<User> selectMyUserPage(IPage<User> page, User user, Long deptId, String hasOrgNo, String tenantId) {
 
 		List<Long> deptIdList = new ArrayList<>();
-		if ("administrator".equals(AuthUtil.getUserRole())){
+		Dept dept = deptService.getById(deptId);
+//		if ("administrator".equals(AuthUtil.getUserRole())){
+		if (dept.getDeptCategory().equals(1)){
 			deptIdList = getDeptChildIds(deptId);
 		}else{
 			deptIdList.add(deptId);
@@ -581,7 +583,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			deptIdList.add(byOrgNo.getId());
 		}
 
-		Dept dept = deptService.getById(deptId);
+
 		Dept parentDept = deptService.getById(dept.getParentId());
 		if (parentDept.getOrgNo().startsWith("999")){
 			deptIdList.add(parentDept.getId());

src/main/resources/application-dev.yml

@@ -77,4 +77,4 @@ oss:
 
 hangxin:
   url: http://22.237.189.107:9001
-  sysId: "000017"
+  sysid: "000017"

src/main/resources/application-prod.yml

@@ -56,4 +56,4 @@ oss:
 
 hangxin:
   url: http://22.237.189.107:9001
-  sysId: "000017"
+  sysid: "000017"