diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 04940ba..0364577 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -64,6 +64,17 @@ public class SysUserController extends BaseController
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+    /**
+     * 获取领导账号列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/ldUserlist")
+    public TableDataInfo ldUserlist(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectldUserlist(user);
+        return getDataTable(list);
+    }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
@@ -176,12 +187,25 @@ public class SysUserController extends BaseController
                 nuser.setPassword(SecurityUtils.encryptPassword("111111"));
                 nuser.setUserName(account);
                 nuser.setNickName(account);
-                nuser.setPcId(user.getPcId());
-                nuser.setPcIds(String.join(",",user.getPcIds()));
-                nuser.setPcNames(String.join(",",user.getPcNames()));
-                nuser.setVoteIds(String.join(",",user.getVoteIds()));
-                nuser.setItemIds(String.join(",",user.getItemIds()));
-                nuser.setItemNames(String.join(",",user.getItemNames()));
+
+                if(user.getPcId()!=null){
+                    nuser.setPcId(user.getPcId());
+                }
+                if(user.getPcIds()!=null){
+                    nuser.setPcIds(String.join(",",user.getPcIds()));
+                }
+                if(user.getPcNames()!=null){
+                    nuser.setPcNames(String.join(",",user.getPcNames()));
+                }
+                if(user.getItemIds()!=null){
+                    nuser.setItemIds(String.join(",",user.getItemIds()));
+                }
+                if(user.getVoteIds()!=null){
+                    nuser.setVoteIds(String.join(",",user.getVoteIds()));
+                }
+                if(user.getItemNames()!=null){
+                    nuser.setItemNames(String.join(",",user.getItemNames()));
+                }
                 nuser.setCreateBy(getUsername());
                 nuser.setRoleIds(roleIds);
                 nuser.setDeptId(user.getDeptId());
@@ -241,7 +265,7 @@ public class SysUserController extends BaseController
      * 根据考核任务id删除用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Log(title = "评分账号", businessType = BusinessType.DELETE)
     @DeleteMapping("/pcIds/{pcIds}")
     public AjaxResult removeBypcIds(@PathVariable Long[] pcIds)
     {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index ae7cb84..22eb59c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -126,4 +126,6 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     int deleteUserByPcIds(Long[] pcIds);
+
+    List<SysUser> selectldUserlist(SysUser user);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 54ddaed..22f5bad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -205,4 +205,6 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     int deleteUserByPcIds(Long[] pcIds);
+
+    List<SysUser> selectldUserlist(SysUser user);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 2788541..35669a0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -78,6 +78,12 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectldUserlist(SysUser user) {
+        return userMapper.selectldUserlist(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 
@@ -482,15 +488,17 @@ public class SysUserServiceImpl implements ISysUserService
             param.setPcId(pcId);
             List<SysUser> sysUsers = userMapper.selectUserList(param);
             List<Long> userIds = sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList());
-            for (Long userId : userIds)
-            {
-                checkUserAllowed(new SysUser(userId));
-                checkUserDataScope(userId);
+            if(userIds!=null&&userIds.size()>0){
+                for (Long userId : userIds)
+                {
+                    checkUserAllowed(new SysUser(userId));
+                    checkUserDataScope(userId);
+                }
+                // 删除用户与角色关联
+                userRoleMapper.deleteUserRole(userIds.stream().toArray(Long[]::new));
+                // 删除用户与岗位关联
+                userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new));
             }
-            // 删除用户与角色关联
-            userRoleMapper.deleteUserRole(userIds.stream().toArray(Long[]::new));
-            // 删除用户与岗位关联
-            userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new));
         }
         return userMapper.deleteUserByPcIds(pcIds);
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6a014c4..1219afe 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="pcId != null "> AND u.pc_id = #{pcId}</if>
+		<!--<if test="pcIds != null "> AND u.pc_ids = #{pcIds}</if>-->
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
@@ -93,6 +94,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+
+	<!--仅查询领导账号使用-->
+    <select id="selectldUserlist" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids, u.item_ids, u.item_names,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="pcIds != null "> AND u.pc_ids = #{pcIds}</if>
+		<if test="pcIds == null "> AND u.pc_ids IS NOT NULL</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+
+
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids,u.item_ids, u.item_names,u.uid, u.email, u.phonenumber, u.status, u.create_time
@@ -242,17 +256,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
  	
- 	<delete id="deleteUserByIds" parameterType="Long">
+ 	<!--<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
         </foreach> 
+ 	</delete>-->
+ 	<delete id="deleteUserByIds" parameterType="Long">
+		delete from sys_user where user_id in
+ 		<foreach collection="array" item="userId" open="(" separator="," close=")">
+ 			#{userId}
+        </foreach>
  	</delete>
+
  	<delete id="deleteUserByPcIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where pc_id in
+ 		delete from sys_user  where pc_id in
  		<foreach collection="array" item="pcId" open="(" separator="," close=")">
  			#{pcId}
         </foreach>
  	</delete>
-
 </mapper> 
\ No newline at end of file