Forráskód Böngészése

生物防控人员

523096025 2 éve
szülő
commit
1e392a1504

+ 2 - 0
huimv-receive/src/main/java/com/huimv/receive/entity/vo/UserAccountVo.java

@@ -14,6 +14,8 @@ public class UserAccountVo {
      * 员工工号
      */
     private String userId;
+    private String account;
+    private String password;
 
     /**
      * 员工姓名

+ 4 - 4
huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -28,10 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.util.*;
 import java.util.List;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -149,6 +147,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysAccountMultilevel.setPhone(sysUser.getUserPhone());
         sysAccountMultilevel.setWorkName(sysUser.getDepartment());
         sysAccountMultilevel.setPapersCode(sysUser.getCardNum());
+        sysAccountMultilevel.setPid(0);
+        sysAccountMultilevel.setPids("");
 //        sysAccountMultilevel.setPapersType(sysUser.getCardType());
         sysAccountMultilevel.setUserId(id);
         sysAccountMultilevelMapper.insert(sysAccountMultilevel);
@@ -194,7 +194,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public Result removeAccount(Map<String, String> map) {
         String ids = map.get("ids");
-        sysAccountMultilevelMapper.delete(new QueryWrapper<SysAccountMultilevel>().eq("user_id",ids.split(",")));
+        sysAccountMultilevelMapper.delete(new QueryWrapper<SysAccountMultilevel>().eq("user_id", Arrays.asList(ids.split(","))));
         return new Result(10000,"删除成功",true);
 
     }

+ 1 - 3
huimv-receive/src/main/resources/mapper/SysUserMapper.xml

@@ -32,9 +32,7 @@
     <select id="pageAccount" resultType="com.huimv.receive.entity.vo.UserAccountVo">
 SELECT sys_user.`user_id`,sys_user.`id`,sys_user.`user_name`,sys_user.`job`, sys_user.`work_location`, sys_user.`work_location_type` ,
 	sys_account_multilevel.`account`,sys_account_multilevel.`password`
-FROM `sys_user`
-
- LEFT JOIN `sys_account_multilevel`   ON `sys_user`.id = `sys_account_multilevel`.user_id
+FROM `sys_account_multilevel` INNER JOIN   `sys_user`   ON `sys_user`.id = `sys_account_multilevel`.user_id
    ${ew.customSqlSegment} AND`sys_account_multilevel`.farm_id = #{farmId}  and  `sys_account_multilevel`.user_id  IS NOT NULL
  ORDER  BY sys_account_multilevel.id DESC
     </select>