系统相关修改

tianhu-system/src/main/java/com/tianhu/system/controller/OwnCompanyController.java

@@ -1,5 +1,6 @@
 package com.tianhu.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tianhu.common.core.constant.UserConstants;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -163,9 +164,10 @@ public class OwnCompanyController extends BaseController
     @GetMapping("/companyList")
     public  AjaxResult companyList(SysCompany company)
     {
-        /*company.setScyStt("00");
-        List<SysCompany> list = sysCompanyService.selectSysCompanyList(company);*/
-        return AjaxResult.success(new ArrayList<>());
+        LambdaQueryWrapper<SysCompany> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysCompany::getScyStatus, "00");
+        List<SysCompany> companyList = sysCompanyService.findSysCompanys(lambdaQueryWrapper);
+        return AjaxResult.success(companyList);
     }
 
     /**

tianhu-system/src/main/java/com/tianhu/system/controller/OwnSysUserController.java

@@ -92,9 +92,6 @@ public class OwnSysUserController extends BaseController
         if(!CommonUtil.isEmpty(nickName)){
             ownSysUser.setNickName(nickName);
         }
-        if(!CommonUtil.isEmpty(phonenumber)){
-            ownSysUser.setPhonenumber(phonenumber);
-        }
         if(!CommonUtil.isEmpty(status)){
             ownSysUser.setStatus(status);
         }

tianhu-system/src/main/java/com/tianhu/system/controller/SysMenuController.java

@@ -9,6 +9,7 @@ import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
 import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.domain.SysMenu;
 import com.tianhu.system.service.ISysMenuService;
@@ -38,6 +39,8 @@ public class SysMenuController extends BaseController
     private ISysUserService userService;
     @Autowired
     private ISysPermissionService permissionService;
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 获取菜单列表
@@ -162,11 +165,12 @@ public class SysMenuController extends BaseController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+//        Long userId = SecurityUtils.getUserId();
+        SysUser user = tokenService.getLoginUser().getSysUser();
         //原始版本，根据用户角色查询菜单
 //        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
 
-        List<SysMenu> menus = this.getMenuTreeByProduct(userId);
+        List<SysMenu> menus = this.getMenuTreeByProduct(user.getUserId());
 
         return AjaxResult.success(menuService.buildMenus(menus));
     }
@@ -181,7 +185,8 @@ public class SysMenuController extends BaseController
     private List<SysMenu> getMenuTreeByProduct(Long userId){
         System.out.println("获取菜单树--beg1");
         List<SysMenu> menus = null;
-        SysUser user = userService.selectUserById(userId);
+//        SysUser user = userService.selectUserById(userId);
+        SysUser user = tokenService.getLoginUser().getSysUser();
         //平台走原流程
         if(SysConstant.PLATFORM_NO.equals(user.getCompanyId()) ){
             menus = menuService.selectMenuTreeByUserId(userId);

tianhu-system/src/main/java/com/tianhu/system/controller/SysProfileController.java

@@ -51,28 +51,15 @@ public class SysProfileController extends BaseController
     public AjaxResult profile(@PathVariable String sscDomain)
     {
         LoginUser loginUser = tokenService.getLoginUser();
-        String companyId = loginUser.getSysUser().getCompanyId();
+        /*String companyId = loginUser.getSysUser().getCompanyId();
         System.out.println("sscDomain1111111======>"+sscDomain);
-//        String companyId =  RedisUtils.getDictValue("sys_domain_name", sscDomain);
-//        System.out.println("companyId========>"+companyId);
-//        if(CommonUtil.isEmpty(companyId)){
-//            SysDictData dictData =new SysDictData();
-//            dictData.setDictLabel(sscDomain);
-//            dictData.setStatus("0");
-//            List<SysDictData> list = iSysDictDataService.selectDictDataList(dictData);
-//            System.out.println("-"+list);
-//            if(list.size()>0){
-//                companyId =list.get(0).getDictValue();
-//            }
-//        }
         String username = SecurityUtils.getUsername();
         Map map =new HashMap();
         map.put("companyId",companyId);
         map.put("userName",username);
-        SysUser user = userService.selectUserByUser(map);
-        AjaxResult ajax = AjaxResult.success(user);
-        ajax.put("roleGroup", userService.selectUserRole(map));
-//        ajax.put("postGroup", userService.selectUserPost(map));
+        SysUser user = userService.selectUserByUser(map);*/
+        AjaxResult ajax = AjaxResult.success(loginUser.getSysUser());
+        ajax.put("roleGroup", loginUser);
         return ajax;
     }
 

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -12,6 +12,7 @@ import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysDept;
 import com.tianhu.system.domain.*;
 import com.tianhu.system.service.*;
 import com.tianhu.system.utils.SysConstant;
@@ -67,7 +68,7 @@ public class SysUserController extends BaseController
     @Autowired
     private TokenService tokenService;
     @Autowired
-    private ISysCompanyService iSysCompanyService;
+    private ISysUserCompanyRelService userCompanyRelService;
 
 
 
@@ -107,53 +108,55 @@ public class SysUserController extends BaseController
      * 获取当前用户信息
      */
     @GetMapping("/info/{username}")
-    public R<LoginUser> info(@PathVariable("username") String username)
+    public R<Map<String, Object>> info(@PathVariable("username") String username)
     {
         SysUser sysUser = userService.selectUserByUserName(username);
         if (StringUtils.isNull(sysUser))
         {
             return R.fail("用户名或密码错误");
         }
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
-        // 权限集合
-//        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
-
-        Set<String> permissions = this.getPermissions(sysUser);
+        // 查询是否实名认证
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId, sysUser.getUserId());
+        List<SysUserCompanyRel> userCompanyRelList = userCompanyRelService.findSysUserCompanyRels(lambdaQueryWrapper);
 
-        LoginUser sysUserVo = new LoginUser();
-
-        sysUserVo.setSysUser(sysUser);
-        sysUserVo.setRoles(roles);
-        sysUserVo.setPermissions(permissions);
-        return R.ok(sysUserVo);
-    }
-    /**
-     * 通过企业id获取当前用户信息
-     */
-    @GetMapping("/userInfo/{username}/{sscDomain}")
-    public R<LoginUser> userInfo(@PathVariable("username") String username,
-                                 @PathVariable("sscDomain") String sscDomain)
-    {
-        SysUser sysUser = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(sysUser))
-        {
-            return R.fail("用户名或密码错误");
-        }
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
-        // 权限集合
-//        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
+        Map<String, Object> resMap = new HashMap<>();
+        // 未认证
+        if (userCompanyRelList.size() == 0) {
+            resMap.put("code", "0");
+            resMap.put("message", "用户未绑定企业");
 
-        Set<String> permissions = this.getPermissions(sysUser);
+        // 只绑定了一家企业
+        } else if (userCompanyRelList.size() == 1) {
+            resMap.put("code", "1");
+            resMap.put("message", "用户已绑定一家企业");
+            // 绑定企业
+            sysUser.setCompanyId(userCompanyRelList.get(0).getSucrCompanyId());
+            // 不是平台
+            if(!SysConstant.PLATFORM_NO.equals(sysUser.getCompanyId()) ){
+                // 绑定部门
+                sysUser.setDeptId(userCompanyRelList.get(0).getSucrDeptId());
+                SysDept dept = deptService.selectDeptById(userCompanyRelList.get(0).getSucrDeptId());
+                sysUser.setDept(dept);
+            }
+            // 角色集合
+            Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
+            Set<String> permissions = this.getPermissions(sysUser);
 
-        LoginUser sysUserVo = new LoginUser();
+            LoginUser sysUserVo = new LoginUser();
+            sysUserVo.setRoles(roles);
+            sysUserVo.setPermissions(permissions);
+            sysUserVo.setSysUser(sysUser);
 
-        sysUserVo.setSysUser(sysUser);
-        sysUserVo.setRoles(roles);
-        sysUserVo.setPermissions(permissions);
-        return R.ok(sysUserVo);
+            resMap.put("loginUser", sysUserVo);
+        // 绑定多加企业
+        } else {
+            resMap.put("code", "2");
+            resMap.put("message", "用户已绑定" + userCompanyRelList.size() + "家企业");
+        }
+        return R.ok(resMap);
     }
+
     /**
      * 获取用户信息
      *
@@ -169,7 +172,8 @@ public class SysUserController extends BaseController
         //公司用户判断角色isAuto是否包括1数据，如包含则菜单权限数据取企业-产品-菜单数据
         //不包含则取角色-菜单 与 企业产品菜单数据并集
         //获取用户角色列表，判断是否存在isAuto
-        SysUser user = userService.selectUserById(userId);
+//        SysUser user = userService.selectUserById(userId);
+        SysUser user = tokenService.getLoginUser().getSysUser();
         // 权限集合
         System.out.println("getInfo 菜单权限加载开始");
         Set<String> permissions = this.getPermissions(user);

tianhu-system/src/main/java/com/tianhu/system/domain/OwnSysUser.java

@@ -45,31 +45,8 @@ public class OwnSysUser extends BaseEntity {
     )
     private String deptName;
 
-    public String getPostName() {
-        return postName;
-    }
-
-    public void setPostName(String postName) {
-        this.postName = postName;
-    }
-
-    @Excel(
-            name = "职级名称",
-            type = Type.IMPORT
-    )
-    private String postName;
     private Long deptId;
 
-    public Long getPostId() {
-        return postId;
-    }
-
-    public void setPostId(Long postId) {
-        this.postId = postId;
-    }
-
-    private Long postId;
-
     public Long getRoleId() {
         return roleId;
     }
@@ -93,7 +70,6 @@ public class OwnSysUser extends BaseEntity {
     @Excel(
             name = "手机号码"
     )
-    private String phonenumber;
     private String sex;
     private String avatar;
     @Excel(
@@ -263,13 +239,6 @@ public class OwnSysUser extends BaseEntity {
             max = 11,
             message = "手机号码长度不能超过11个字符"
     )
-    public String getPhonenumber() {
-        return this.phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
 
     public String getSex() {
         return this.sex;
@@ -465,7 +434,6 @@ public class OwnSysUser extends BaseEntity {
                 .append("userName", this.getUserName())
                 .append("nickName", this.getNickName())
                 .append("email", this.getEmail())
-                .append("phonenumber", this.getPhonenumber())
                 .append("sex", this.getSex())
                 .append("avatar", this.getAvatar())
                 .append("password", this.getPassword())
@@ -491,8 +459,6 @@ public class OwnSysUser extends BaseEntity {
                 .append("companyName", this.getCompanyName())
                 .append("deptName", this.getDeptName())
                 .append("deptName", this.getDeptName())
-                .append("postName", this.getPostName())
-                .append("postId", this.getPostId())
                 .append("roleId", this.getRoleId())
                 .append("roles", this.getRoles())
                 .append("roles", this.getRoles())

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -611,22 +611,11 @@ public class SysUserServiceImpl implements ISysUserService
                 String nickName = user.getNickName();
                 //             用户邮箱
                 String email = user.getEmail();
-                    String check = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
-                    Pattern rege = Pattern.compile(check);
-                    Matcher ma = rege.matcher(email);
-                    boolean isMat = ma.matches();
-
-                //             手机号
-                String phonenumber = user.getPhonenumber();
-                String regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
-//                if(phonenumber.length() != 11){
-//                        failureNum++;
-//                        failureMsg.append("<br/>手机号" + phonenumber + "应为11位");
-//                             }else {
-                    Pattern p = Pattern.compile(regex);
-                    Matcher m = p.matcher(phonenumber);
-                    boolean isMatch = m.matches();
-//                }
+                String check = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
+                Pattern rege = Pattern.compile(check);
+                Matcher ma = rege.matcher(email);
+                boolean isMat = ma.matches();
+
                 //             性别
                 String sex = user.getSex();
                 //             密码
@@ -648,7 +637,6 @@ public class SysUserServiceImpl implements ISysUserService
                 //             备注
                 String remark    = user.getRemark();
                 map.put("userName", userName);
-                map.put("phonenumber", phonenumber);
                 map.put("delFlag", "0");
                 List<Map> list = userMapper.selectUserByUserNamed(map);
 
@@ -677,10 +665,7 @@ public class SysUserServiceImpl implements ISysUserService
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "不存在");
                 //判断职级表是否有此职级
-            }else if (!isMatch) {
-                failureNum++;
-                failureMsg.append("<br/>" + phonenumber + "格式不正确");
-            }else  if (!isMat) {
+            }if (!isMat) {
                 failureNum++;
                 failureMsg.append("<br/>邮箱" + email + "格式不正确");
             } else {
@@ -704,7 +689,6 @@ public class SysUserServiceImpl implements ISysUserService
                     user.setRoleIds(roleIds);
                     user.setEmail(email);
                     user.setAvatar("");
-                    user.setPhonenumber(phonenumber);
                     user.setSex(sex);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setStatus(status);

tianhu-system/src/main/resources/mapper/system/OwnCompanyMapper.xml

@@ -5,158 +5,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.tianhu.system.mapper.OwnCompanyMapper">
 
 	<resultMap type="SysCompany" id="SysCompanyResult">
-		<result property="scyId"    column="scy_id"    />
-		<result property="scyName"    column="scy_name"    />
-		<result property="scyAbridge"    column="scy_abridge"    />
-		<result property="scyAddress"    column="scy_address"    />
-		<result property="scyPhone"    column="scy_phone"    />
-		<result property="scySocialCode"    column="scy_social_code"    />
-		<result property="scyLegal"    column="scy_legal"    />
-		<result property="scyLicense"    column="scy_license"    />
-		<result property="scyEndTime"    column="scy_end_time"    />
-		<result property="scyDescribe"    column="scy_describe"    />
-		<result property="scyRemarks"    column="scy_remarks"    />
-		<result property="createBy"    column="create_by"    />
-		<result property="createTime"    column="create_time"    />
-		<result property="updateBy"    column="update_by"    />
-		<result property="updateTime"    column="update_time"    />
-		<result property="scyStt"    column="scy_STT"    />
-		<result property="scyStartTime"    column="scy_start_time"    />
-		<result property="scyCode"    column="scy_code"    />
-		<result property="scyUserStaffBinding"    column="scy_user_staff_binding"    />
-		<result property="scyIsGroup"    column="scy_is_group"    />
-		<result property="scyParentId"    column="scy_parent_id"    />
-		<result property="scyLeader"    column="scy_leader"    />
+		<id column="scy_id" property="scyId" />
+		<result column="scy_license_file" property="scyLicenseFile" />
+		<result column="scy_name" property="scyName" />
+		<result column="scy_social_code" property="scySocialCode" />
+		<result column="scy_start_time" property="scyStartTime" />
+		<result column="scy_end_time" property="scyEndTime" />
+		<result column="scy_address" property="scyAddress" />
+		<result column="scy_phone" property="scyPhone" />
+		<result column="scy_legal_file" property="scyLegalFile" />
+		<result column="scy_legal" property="scyLegal" />
+		<result column="scy_legal_id" property="scyLegalId" />
+		<result column="scy_authorization_file" property="scyAuthorizationFile" />
+		<result column="scy_commitment_file" property="scyCommitmentFile" />
+		<result column="scy_appendix_file" property="scyAppendixFile" />
+		<result column="scy_type" property="scyType" />
+		<result column="scy_remarks" property="scyRemarks" />
+		<result column="scy_status" property="scyStatus" />
+		<result column="create_by" property="createBy" />
+		<result column="create_time" property="createTime" />
+		<result column="update_by" property="updateBy" />
+		<result column="update_time" property="updateTime" />
 	</resultMap>
 
 	<sql id="selectSysCompanyVo">
-        select scy_id, scy_name, scy_abridge, scy_address, scy_phone, scy_social_code, scy_legal, scy_license, scy_end_time, scy_describe, scy_remarks, create_by, create_time, update_by, update_time, scy_STT, scy_start_time, scy_code, scy_user_staff_binding, scy_is_group, scy_parent_id, scy_leader from sys_company
+        select scy_id, scy_license_file, scy_name, scy_social_code, scy_start_time, scy_end_time, scy_address, scy_phone, scy_legal_file, scy_legal, scy_legal_id, scy_authorization_file,
+        scy_commitment_file, scy_appendix_file, scy_type, scy_remarks, scy_status, create_by, create_time, update_by, update_time from sys_company
     </sql>
 
 	<select id="selectCompanyList" parameterType="SysCompany" resultMap="SysCompanyResult">
 		<include refid="selectSysCompanyVo"/>
-		where scy_STT !='99'
+		where scy_status !='99'
 			<if test="scyName != null  and scyName != ''"> and scy_name like concat('%', #{scyName}, '%')</if>
-			<if test="scyAbridge != null  and scyAbridge != ''"> and scy_abridge = #{scyAbridge}</if>
-			<if test="scyAddress != null  and scyAddress != ''"> and scy_address = #{scyAddress}</if>
-			<if test="scyPhone != null  and scyPhone != ''"> and scy_phone = #{scyPhone}</if>
-			<if test="scySocialCode != null  and scySocialCode != ''"> and scy_social_code = #{scySocialCode}</if>
-			<if test="scyLegal != null  and scyLegal != ''"> and scy_legal = #{scyLegal}</if>
-			<if test="scyLicense != null  and scyLicense != ''"> and scy_license = #{scyLicense}</if>
-			<if test="scyEndTime != null  and scyEndTime != ''"> and scy_end_time = #{scyEndTime}</if>
-			<if test="scyDescribe != null  and scyDescribe != ''"> and scy_describe = #{scyDescribe}</if>
-			<if test="scyRemarks != null  and scyRemarks != ''"> and scy_remarks = #{scyRemarks}</if>
-			<if test="scyStt != null  and scyStt != ''"> and scy_STT = #{scyStt}</if>
-			<if test="scyStartTime != null  and scyStartTime != ''"> and scy_start_time = #{scyStartTime}</if>
-			<if test="scyCode != null  and scyCode != ''"> and scy_code = #{scyCode}</if>
-			<if test="scyUserStaffBinding != null  and scyUserStaffBinding != ''"> and scy_user_staff_binding = #{scyUserStaffBinding}</if>
-			<if test="scyIsGroup != null  and scyIsGroup != ''"> and scy_is_group = #{scyIsGroup}</if>
-			<if test="scyParentId != null  and scyParentId != ''"> and scy_parent_id = #{scyParentId}</if>
-			<if test="scyLeader != null  and scyLeader != ''"> and scy_leader = #{scyLeader}</if>
 		order by create_time desc
 	</select>
 
 	<select id="selectCompanyByName" parameterType="SysCompany" resultMap="SysCompanyResult">
 		<include refid="selectSysCompanyVo"/>
-		where scy_STT !='99'
+		where scy_status !='99'
 		<if test="scyName != null  and scyName != ''"> and scy_name = #{scyName}</if>
 		<if test="scyId != null  and scyId != ''"> and scy_id != #{scyId}</if>
 	</select>
 
     <update id="updateCompanyStatus" parameterType="SysCompany">
- 		update sys_company set scy_STT = #{scyStt} where scy_id = #{scyId}
+ 		update sys_company set scy_status = #{scyStatus} where scy_id = #{scyId}
 	</update>
 
-<!--	<select id="selectCompanyList" parameterType="SysCompany" resultMap="SysCompanyResult">-->
-<!--		select-->
-<!--				c.scy_id	 		 'scyId'  ,-->
-<!--				c.scy_name 		 'scyName' ,-->
-<!--				c.scy_abridge 	 'scyAbridge',-->
-<!--				c.scy_address	     'scyAddress',-->
-<!--				c.scy_phone        'scyPhone',-->
-<!--				c.scy_social_code  'scySocialCode',-->
-<!--				c.scy_legal     	 'scyLegal',-->
-<!--				c.scy_license 	 'scyLicense',-->
-<!--				s.scs_server_host  'scsServerHost',-->
-<!--				s.scs_email 		 'scsEmail',-->
-<!--				s.scs_auth_code	 'scsAuthCode',-->
-<!--				s.scs_product 	 'scsProduct',-->
-<!--				s.scs_start_time   'scsStartTime',-->
-<!--				s.scs_end_time  	 'scsEndTime',-->
-<!--				s.scs_trial     	 'scsTrial',-->
-<!--				c.scy_describe 	 'scyDescribe',-->
-<!--				c.scy_remarks      'scyRemarks',-->
-<!--				c.create_by    	 'createBy',-->
-<!--				c.create_time  	 'createTime',-->
-<!--				c.update_by 	  	 'updateBy',-->
-<!--				c.update_time 	 'updateTime',-->
-<!--				c.scy_STT			 'scyStt'-->
-
-<!--		from  sys_company c-->
-<!--		left join sys_company_sub s-->
-<!--		on s.scs_company_id	= scy_id-->
-<!--		where c.scy_STT != '99'-->
-<!--		<if test="scyName != null  and scyName != ''"> and c.scy_name like concat('%', #{scyName}, '%')</if>-->
-<!--		<if test="scyAbridge != null  and scyAbridge != ''"> and c.scy_abridge = #{scyAbridge}</if>-->
-<!--		<if test="scyAddress != null  and scyAddress != ''"> and c.scy_address = #{scyAddress}</if>-->
-<!--		<if test="scyPhone != null  and scyPhone != ''"> and c.scy_phone = #{scyPhone}</if>-->
-<!--		<if test="scySocialCode != null  and scySocialCode != ''"> and c.scy_social_code = #{scySocialCode}</if>-->
-<!--		<if test="scyLegal != null  and scyLegal != ''"> and c.scy_legal like concat('%', #{scyLegal}, '%')</if>-->
-<!--		<if test="scyLicense != null  and scyLicense != ''"> and c.scy_license = #{scyLicense}</if>-->
-<!--		<if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
-<!--			AND date_format(s.scs_start_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')-->
-<!--		</if>-->
-<!--		<if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
-<!--			AND date_format(s.scs_end_time ,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')-->
-<!--		</if>-->
-<!--		<if test="scyDescribe != null  and scyDescribe != ''"> and c.scy_describe = #{scyDescribe}</if>-->
-<!--		<if test="scyRemarks != null  and scyRemarks != ''"> and c.scy_remarks = #{scyRemarks}</if>-->
-<!--		<if test="scyStt != null  and scyStt != ''"> and c.scy_STT = #{scyStt}</if>-->
-<!--	</select>-->
-
 	<select id="selectCompany" parameterType="String" resultType="map">
 		select
 		c.scy_id	 		 'scyId'  ,
 		c.scy_name 		 'scyName' ,
-		c.scy_abridge 	 'scyAbridge',
 		c.scy_address	     'scyAddress',
 		c.scy_phone        'scyPhone',
 		c.scy_social_code  'scySocialCode',
 		c.scy_legal     	 'scyLegal',
-		c.scy_license 	 'scyLicense',
-		s.scs_server_host  'scsServerHost',
-		s.scs_email 		 'scsEmail',
-		s.scs_auth_code	 'scsAuthCode',
-		s.scs_product 	 'scsProduct',
-		s.scs_start_time   'scsStartTime',
-		s.scs_end_time  	 'scsEndTime',
-		s.scs_trial     	 'scsTrial',
-		c.scy_describe 	 'scyDescribe',
 		c.scy_remarks      'scyRemarks',
 		c.create_by    	 'createBy',
 		c.create_time  	 'createTime',
 		c.update_by 	  	 'updateBy',
 		c.update_time 	 'updateTime',
-		c.scy_STT			 'scyStt'
-
+		c.scy_status			 'scyStatus'
 		from  sys_company c
-		left join sys_company_sub s
-		on s.scs_company_id	= c.scy_id
-		where c.scy_STT != '99'
+		where c.scy_status != '99'
 		<if test="scyName != null  and scyName != ''"> and scy_name like concat('%', #{c.scyName}, '%')</if>
 		<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(s.scs_start_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
 		</if>
-		<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(s.scs_end_time ,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
-		</if>
-		<if test="scyStt != null  and scyStt != ''"> and c.scy_STT = #{scyStt}</if>
+		<if test="scyStatus != null  and scyStatus != ''"> and c.scy_status = #{scyStatus}</if>
 		<if test="scyId != null  and scyId != ''"> and c.scy_id= #{scyId}</if>
 	</select>
 
-
 	<delete id="deleteSysCompanyByIds" parameterType="String">
-		update sys_company  set scy_STT = '99' where scy_id in
+		update sys_company  set scy_status = '99' where scy_id in
 		<foreach item="scyId" collection="array" open="(" separator="," close=")">
 			#{scyId}
 		</foreach>

tianhu-system/src/main/resources/mapper/system/OwnSysUserMapper.xml

@@ -41,55 +41,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="ssName"     column="ss_name"     />
 		<result property="beginTime"     column="create_time"     />
 		<result property="endTime"     column="create_time"     />
-<!--		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />-->
-<!--		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />-->
-<!--		<collection  property="posts"   javaType="java.util.List"        resultMap="PostResult" />-->
 	</resultMap>
 
-<!--	<resultMap id="deptResult" type="SysDept">-->
-<!--		<id     property="deptId"   column="dept_id"     />-->
-<!--		<result property="parentId" column="parent_id"   />-->
-<!--		<result property="deptName" column="dept_name"   />-->
-<!--		<result property="orderNum" column="order_num"   />-->
-<!--		<result property="leader"   column="leader"      />-->
-<!--		<result property="status"   column="dept_status" />-->
-<!--	</resultMap>-->
-
-<!--	<resultMap id="RoleResult" type="SysRole">-->
-<!--		<id     property="roleId"       column="role_id"        />-->
-<!--		<result property="roleName"     column="role_name"      />-->
-<!--		<result property="roleKey"      column="role_key"       />-->
-<!--		<result property="roleSort"     column="role_sort"      />-->
-<!--		<result property="dataScope"     column="data_scope"    />-->
-<!--		<result property="status"       column="role_status"    />-->
-<!--	</resultMap>-->
-
-<!--	<resultMap id="PostResult" type="SysPost" >-->
-<!--		<id     property="postId"        column="post_id"       />-->
-<!--		<result property="companyId"     column="company_id"  	/>-->
-<!--		<result property="postCode"      column="post_code"     />-->
-<!--		<result property="postName"      column="post_name"     />-->
-<!--		<result property="postSort"      column="post_sort"     />-->
-<!--		<result property="status"        column="status"        />-->
-<!--		<result property="createBy"      column="create_by"     />-->
-<!--		<result property="createTime"    column="create_time"   />-->
-<!--		<result property="updateBy"      column="update_by"     />-->
-<!--		<result property="updateTime"    column="update_time"   />-->
-<!--		<result property="remark"        column="remark"        />-->
-<!--	</resultMap>-->
-
 	<select id="selectUserList"   resultMap="OwnSysUserResult" parameterType="OwnSysUser">
 		SELECT
-		s.scy_id,
-		s.scy_name,
 		u.user_id,
-		u.dept_id,
 		u.nick_name,
 		u.user_name,
-		u.company_id,
 		u.email,
 		u.avatar,
-		u.phonenumber,
 		u.password,
 		u.sex,
 		u.status,
@@ -97,31 +57,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.login_ip,
 		u.login_date,
 		u.create_by,
 		u.create_time,
-		u.remark,
-		u.staff_code,
-		u.birth_date,
-		u.entry_date,
-		u.leave_date,
-		u.education,
-		u.position,
-		d.dept_name,
-		d.leader,
-
-		p.post_id,
-		p.post_name,
-		i.ss_name
+		u.remark
 		FROM sys_user u
-		LEFT JOIN sys_user_post up ON u.user_id = up.user_id
-		LEFT JOIN sys_post p ON up.post_id = p.post_id
-		LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
-		LEFT JOIN sys_company s ON s.scy_id = u.company_id
-		LEFT JOIN sys_staff_inf i ON i.ss_id = u.staff_code
+		left join
+			sys_user_company_rel ucr
+		on
+			(ucr.sucr_user_id = u.user_id
+			<if test="companyId != '000000'">
+				and ucr.sucr_company_id = #{companyId}
+			</if>
+			)
 		WHERE u.del_flag = '0'
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
@@ -132,24 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<if test="companyId != null and companyId != ''">
-			AND u.company_id = #{companyId}
-		</if>
-		<if test="staffCode != null and staffCode != ''">
-			AND u.staff_code = #{staffCode}
-		</if>
 		<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
 		</if>
 		<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 		</if>
-		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
-		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by u.create_time desc
@@ -186,35 +120,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
-    <resultMap type="SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
-        <result property="deptId"       column="dept_id"      />
-        <result property="userName"     column="user_name"    />
-        <result property="companyId"    column="company_id"   />
-        <result property="nickName"     column="nick_name"    />
-        <result property="email"        column="email"        />
-        <result property="phonenumber"  column="phonenumber"  />
-        <result property="sex"          column="sex"          />
-        <result property="avatar"       column="avatar"       />
-        <result property="password"     column="password"     />
-        <result property="status"       column="status"       />
-        <result property="delFlag"      column="del_flag"     />
-        <result property="loginIp"      column="login_ip"     />
-        <result property="loginDate"    column="login_date"   />
-        <result property="createBy"     column="create_by"    />
-        <result property="createTime"   column="create_time"  />
-        <result property="updateBy"     column="update_by"    />
-        <result property="updateTime"   column="update_time"  />
-        <result property="remark"       column="remark"       />
-        <result property="staffCode"    column="staff_code"   />
-        <result property="birthDate"    column="birth_date"   />
-        <result property="entryDate"    column="entry_date"   />
-        <result property="leaveDate"    column="leave_date"   />
-        <result property="education"    column="education"    />
-        <result property="position"     column="position"     />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-        <collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
-    </resultMap>
+	<resultMap type="SysUser" id="SysUserResult">
+		<id     property="userId"       column="user_id"      />
+		<result property="userName"     column="user_name"    />
+		<result property="nickName"     column="nick_name"    />
+		<result property="email"        column="email"        />
+		<result property="sex"          column="sex"          />
+		<result property="avatar"       column="avatar"       />
+		<result property="password"     column="password"     />
+		<result property="status"       column="status"       />
+		<result property="delFlag"      column="del_flag"     />
+		<result property="loginIp"      column="login_ip"     />
+		<result property="idCard"       column="id_card"     />
+		<result property="idCardFile"   column="id_card_file"     />
+		<result property="loginDate"    column="login_date"   />
+		<result property="createBy"     column="create_by"    />
+		<result property="createTime"   column="create_time"  />
+		<result property="updateBy"     column="update_by"    />
+		<result property="updateTime"   column="update_time"  />
+		<result property="remark"       column="remark"       />
+		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
+	</resultMap>
 
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"   column="dept_id"     />
@@ -234,14 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"       column="role_status"    />
     </resultMap>
 
-    <sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.company_id, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.staff_code, u.birth_date, u.entry_date, u.leave_date, u.education, u.position,
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+	<sql id="selectUserVo">
+        select u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.id_card, u.id_card_file, u.login_date, u.create_by, u.create_time, u.remark
         from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
     </sql>
 
 	<select id="selectUserByStaff" parameterType="String" resultMap="SysUserResult">

tianhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -41,8 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		and d.company_id in (
 			<if test="companyId != null and companyId != '' and companyId !='000000'">
 			SELECT scy_id FROM sys_company
-			WHERE scy_stt = '00'
-				and (scy_id = #{companyId} or scy_parent_id = #{companyId})
+			left join
+			WHERE scy_status = '00'
+				and (scy_id = #{companyId})
 			</if>
 			<if test="companyId == '000000'">
 				#{companyId}
@@ -68,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="companyId != null and companyId != ''">
 			and d.company_id in (
 			SELECT scy_id FROM sys_company
-			WHERE (scy_id != #{companyId} or scy_parent_id != #{companyId})
-			and scy_stt = '00'
+			WHERE (scy_id != #{companyId})
+			and scy_status = '00'
 			)
 		</if>
 		<if test="status != null and status != ''">

tianhu-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -28,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
     
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
@@ -55,9 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="isAuto != null and isAuto != ''">
 			AND r.is_auto = #{isAuto}
 		</if>
-<!--		<if test="isAuto != null and isAuto != ''">-->
-<!--			OR  r.role_id = #{isAuto}-->
-<!--		</if>-->
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by r.create_time desc
@@ -105,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectRolesByUser" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and u.user_name = #{userName} and u.company_id = #{companyId}
+		WHERE r.del_flag = '0' and u.user_name = #{userName} and r.company_id = #{companyId}
 	</select>
 
 	<select id="selectRoleByRoleName" parameterType="String" resultMap="SysRoleResult">

tianhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -6,65 +6,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<resultMap type="SysUser" id="SysUserResult">
 		<id     property="userId"       column="user_id"      />
-		<result property="deptId"       column="dept_id"      />
 		<result property="userName"     column="user_name"    />
-		<result property="companyId"    column="company_id"   />
 		<result property="nickName"     column="nick_name"    />
 		<result property="email"        column="email"        />
-		<result property="phonenumber"  column="phonenumber"  />
 		<result property="sex"          column="sex"          />
 		<result property="avatar"       column="avatar"       />
 		<result property="password"     column="password"     />
 		<result property="status"       column="status"       />
 		<result property="delFlag"      column="del_flag"     />
 		<result property="loginIp"      column="login_ip"     />
+		<result property="idCard"       column="id_card"     />
+		<result property="idCardFile"   column="id_card_file"     />
 		<result property="loginDate"    column="login_date"   />
 		<result property="createBy"     column="create_by"    />
 		<result property="createTime"   column="create_time"  />
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
-		<result property="staffCode"    column="staff_code"   />
-		<result property="birthDate"    column="birth_date"   />
-		<result property="entryDate"    column="entry_date"   />
-		<result property="leaveDate"    column="leave_date"   />
-		<result property="education"    column="education"    />
-		<result property="position"     column="position"     />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
 	</resultMap>
 
-<!--	<resultMap type="OwnSysUser" id="OwnSysUserResult">-->
-<!--		<id     property="userId"       column="user_id"      />-->
-<!--		<result property="deptId"       column="dept_id"      />-->
-<!--		<result property="userName"     column="user_name"    />-->
-<!--		<result property="companyId"    column="company_id"   />-->
-<!--		<result property="nickName"     column="nick_name"    />-->
-<!--		<result property="email"        column="email"        />-->
-<!--		<result property="phonenumber"  column="phonenumber"  />-->
-<!--		<result property="sex"          column="sex"          />-->
-<!--		<result property="avatar"       column="avatar"       />-->
-<!--		<result property="password"     column="password"     />-->
-<!--		<result property="status"       column="status"       />-->
-<!--		<result property="delFlag"      column="del_flag"     />-->
-<!--		<result property="loginIp"      column="login_ip"     />-->
-<!--		<result property="loginDate"    column="login_date"   />-->
-<!--		<result property="createBy"     column="create_by"    />-->
-<!--		<result property="createTime"   column="create_time"  />-->
-<!--		<result property="updateBy"     column="update_by"    />-->
-<!--		<result property="updateTime"   column="update_time"  />-->
-<!--		<result property="remark"       column="remark"       />-->
-<!--		<result property="staffCode"    column="staff_code"   />-->
-<!--		<result property="birthDate"    column="birth_date"   />-->
-<!--		<result property="entryDate"    column="entry_date"   />-->
-<!--		<result property="leaveDate"    column="leave_date"   />-->
-<!--		<result property="education"    column="education"    />-->
-<!--		<result property="position"     column="position"     />-->
-<!--		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />-->
-<!--		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />-->
-<!--		<collection  property="posts"   javaType="java.util.List"        resultMap="PostResult" />-->
-<!--	</resultMap>-->
-
 	<resultMap id="deptResult" type="SysDept">
 		<id     property="deptId"   column="dept_id"     />
 		<result property="parentId" column="parent_id"   />
@@ -84,92 +46,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.company_id, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.staff_code, u.birth_date, u.entry_date, u.leave_date, u.education, u.position,
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        select u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.id_card, u.id_card_file, u.login_date, u.create_by, u.create_time, u.remark
         from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
     </sql>
 
-
-<!--	<select id="selectUserList"   resultType="OwnSysUser" parameterType="OwnSysUserResult">-->
-<!--		SELECT u.user_id 'userId',-->
-<!--		u.dept_id 'deptId',-->
-<!--		u.nick_name 'nickName',-->
-<!--		u.user_name 'userName',-->
-<!--		u.company_id 'companyId',-->
-<!--		u.email 'email',-->
-<!--		u.avatar 'avatar',-->
-<!--		u.phonenumber 'phonenumber',-->
-<!--		u.password 'password',-->
-<!--		u.sex 'sex',-->
-<!--		u.status 'status',-->
-<!--		u.del_flag 'delFlag',-->
-<!--		u.login_ip 'loginIp',-->
-<!--		u.login_date 'loginDate',-->
-<!--		u.create_by 'createBy',-->
-<!--		DATE_FORMAT(u.create_time,'%Y-%m-%d %H:%i:%s')  AS 'createTime',-->
-<!--		u.remark 'remark',-->
-<!--		u.staff_code 'staffCode',-->
-<!--		u.birth_date 'birthDate',-->
-<!--		u.entry_date 'entryDate',-->
-<!--		u.leave_date 'leaveDate',-->
-<!--		u.education 'education',-->
-<!--		u.position 'position',-->
-<!--		d.dept_name 'deptName',-->
-<!--		d.leader 'leader',-->
-<!--		p.post_id 'postId',-->
-<!--		r.role_id 'roleId',-->
-<!--		r.role_name 'roleName',-->
-<!--		p.post_name 'postName'-->
-<!--		FROM sys_user u-->
-<!--		LEFT JOIN sys_user_post up ON u.user_id = up.user_id-->
-<!--		LEFT JOIN sys_post p ON up.post_id = p.post_id-->
-<!--		LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id-->
-<!--		LEFT JOIN sys_role r ON r.role_id = ur.role_id-->
-<!--		LEFT JOIN sys_dept d ON u.dept_id = d.dept_id-->
-<!--		WHERE u.del_flag = '0'-->
-<!--		<if test="userName != null and userName != ''">-->
-<!--			AND u.user_name like concat('%', #{userName}, '%')-->
-<!--		</if>-->
-<!--		<if test="status != null and status != ''">-->
-<!--			AND u.status = #{status}-->
-<!--		</if>-->
-<!--		<if test="phonenumber != null and phonenumber != ''">-->
-<!--			AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
-<!--		</if>-->
-<!--		<if test="companyId != null and companyId != ''">-->
-<!--			AND u.company_id = #{companyId}-->
-<!--		</if>-->
-<!--		<if test="params != null and params != ''">-->
-<!--		<if test="createTime != null and createTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
-<!--			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{createTime},'%y%m%d')-->
-<!--		</if>-->
-<!--		</if>-->
-<!--		<if test="params != null and params != ''">-->
-<!--		<if test="createTime != null and createTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
-<!--			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{createTime},'%y%m%d')-->
-<!--		</if>-->
-<!--		</if>-->
-<!--		<if test="deptId != null and deptId != 0">-->
-<!--			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))-->
-<!--		</if>-->
-<!--		&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-
-<!--	</select>-->
-
-
 	<select id="selectUser" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,
-		u.dept_id, u.nick_name, u.user_name, u.company_id,
-		u.email, u.avatar, u.phonenumber, u.password, u.sex,
-		u.status, u.del_flag, u.login_ip, u.login_date, u.create_by,
-		u.create_time, u.remark, u.staff_code, u.birth_date, u.entry_date,
-		u.leave_date, u.education, u.position, d.dept_name, d.leader
+		select
+			u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.password, u.sex, u.status,
+			u.del_flag, u.login_ip, u.id_card, u.id_card_file, u.login_date, u.create_by, u.create_time, u.remark
 		from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
@@ -186,9 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
-		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
-		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
@@ -202,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUserByUser" parameterType="map" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_name = #{userName}
-		and  u.company_id = #{companyId}
 		and u.del_flag = '0'
 	</select>