Merge remote-tracking branch 'origin/master'

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -863,7 +863,6 @@ public class UserController {
     @ApiLog("签字注师2")
     @GetMapping("list1")
     public List<String> list1(){
-        String id= "1681920842985959425";
-        return userService.selectSignatureNaster(id);
+        return userService.selectSignatureNaster();
     }
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -250,5 +250,5 @@ public interface UserMapper extends BaseMapper<User> {
     Integer getAccountantUserCount(@Param("userId") String userId);
 
 
-    List<String> selectSignatureNaster(String id);
+    List<String> selectSignatureNaster();
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -430,7 +430,8 @@
 	us.id
 	from sys_role as role
 	left join sys_user_role as user_role on user_role.role_id= role.id
-	left join sys_user as us on us.id= user_role.user_id
-	where  role.id = #{id}
+	left join sys_user as us on us.id= user_role.user_id and us.del_flag = 0
+	where  role.name = '签字注师2' and role.del_flag = 0
 	</select>
+
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -600,8 +600,13 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 		return userMapper.getAccountantUserCount (userId);
 	}
 
-	public List<String> selectSignatureNaster(String id) {
-		List<String> list= userMapper.selectSignatureNaster(id);
+	/**
+	 * 签字注师2 用户id返回
+	 * @return
+	 */
+	public List<String> selectSignatureNaster() {
+		//返回签字注师2下的  用户id
+		List<String> list= userMapper.selectSignatureNaster();
 		return list;
 
 	}

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -324,6 +324,5 @@ public class  UserDTO extends BaseDTO {
      */
     private Integer accountantUserFlag;
 
-    private List<String> qz2;
 
 }