vue版本上线

jshERP-boot/src/main/java/com/jsh/erp/service/user/UserComponent.java

@@ -0,0 +1,73 @@
+package com.jsh.erp.service.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.service.ICommonQuery;
+import com.jsh.erp.utils.Constants;
+import com.jsh.erp.utils.QueryUtils;
+import com.jsh.erp.utils.StringUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Service(value = "user_component")
+@UserResource
+public class UserComponent implements ICommonQuery {
+
+    @Resource
+    private UserService userService;
+
+    @Override
+    public Object selectOne(Long id) throws Exception {
+        return userService.getUser(id);
+    }
+
+    @Override
+    public List<?> select(Map<String, String> map)throws Exception {
+        return getUserList(map);
+    }
+
+    private List<?> getUserList(Map<String, String> map)throws Exception {
+        String search = map.get(Constants.SEARCH);
+        String userName = StringUtil.getInfo(search, "userName");
+        String loginName = StringUtil.getInfo(search, "loginName");
+        String order = QueryUtils.order(map);
+        String filter = QueryUtils.filter(map);
+        return userService.select(userName, loginName, QueryUtils.offset(map), QueryUtils.rows(map));
+    }
+
+    @Override
+    public Long counts(Map<String, String> map)throws Exception {
+        String search = map.get(Constants.SEARCH);
+        String userName = StringUtil.getInfo(search, "userName");
+        String loginName = StringUtil.getInfo(search, "loginName");
+        return userService.countUser(userName, loginName);
+    }
+
+    @Override
+    public int insert(JSONObject obj, HttpServletRequest request)throws Exception {
+        return userService.insertUser(obj, request);
+    }
+
+    @Override
+    public int update(JSONObject obj, HttpServletRequest request)throws Exception {
+        return userService.updateUser(obj, request);
+    }
+
+    @Override
+    public int delete(Long id, HttpServletRequest request)throws Exception {
+        return userService.deleteUser(id, request);
+    }
+
+    @Override
+    public int deleteBatch(String ids, HttpServletRequest request)throws Exception {
+        return userService.batchDeleteUser(ids, request);
+    }
+
+    @Override
+    public int checkIsNameExist(Long id, String name)throws Exception {
+        return userService.checkIsNameExist(id, name);
+    }
+
+}

jshERP-boot/src/main/java/com/jsh/erp/service/user/UserResource.java

@@ -0,0 +1,15 @@
+package com.jsh.erp.service.user;
+
+import com.jsh.erp.service.ResourceInfo;
+
+import java.lang.annotation.*;
+
+/**
+ * @author jishenghua qq752718920  2018-10-7 15:26:27
+ */
+@ResourceInfo(value = "user")
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserResource {
+}

jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java

@@ -0,0 +1,745 @@
+package com.jsh.erp.service.user;
+
+import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.service.redis.RedisService;
+import com.jsh.erp.service.role.RoleService;
+import org.springframework.util.StringUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.BusinessConstants;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.datasource.mappers.UserMapper;
+import com.jsh.erp.datasource.mappers.UserMapperEx;
+import com.jsh.erp.datasource.vo.TreeNodeEx;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.exception.JshException;
+import com.jsh.erp.service.log.LogService;
+import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
+import com.jsh.erp.service.tenant.TenantService;
+import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.utils.ExceptionCodeConstants;
+import com.jsh.erp.utils.StringUtil;
+import com.jsh.erp.utils.Tools;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@Service
+public class UserService {
+    private Logger logger = LoggerFactory.getLogger(UserService.class);
+
+    private static final String TEST_USER = "jsh";
+
+    @Value("${demonstrate.open}")
+    private boolean demonstrateOpen;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private UserMapperEx userMapperEx;
+    @Resource
+    private OrgaUserRelService orgaUserRelService;
+    @Resource
+    private LogService logService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private TenantService tenantService;
+    @Resource
+    private UserBusinessService userBusinessService;
+    @Resource
+    private RoleService roleService;
+    @Resource
+    private RedisService redisService;
+
+    public User getUser(long id)throws Exception {
+        User result=null;
+        try{
+            result=userMapper.selectByPrimaryKey(id);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+
+    public List<User> getUserListByIds(String ids)throws Exception {
+        List<Long> idList = StringUtil.strToLongList(ids);
+        List<User> list = new ArrayList<>();
+        try{
+            UserExample example = new UserExample();
+            example.createCriteria().andIdIn(idList);
+            list = userMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<User> getUser()throws Exception {
+        UserExample example = new UserExample();
+        example.createCriteria().andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+        List<User> list=null;
+        try{
+            list=userMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<UserEx> select(String userName, String loginName, int offset, int rows)throws Exception {
+        List<UserEx> list=null;
+        try{
+            list=userMapperEx.selectByConditionUser(userName, loginName, offset, rows);
+            for(UserEx ue: list){
+                String userType = "";
+                if(demonstrateOpen && TEST_USER.equals(ue.getLoginName())){
+                    userType = "演示用户";
+                } else {
+                    if (ue.getId().equals(ue.getTenantId())) {
+                        userType = "租户";
+                    } else if(ue.getTenantId() == null){
+                        userType = "超管";
+                    } else {
+                        userType = "普通";
+                    }
+                }
+                ue.setUserType(userType);
+            }
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public Long countUser(String userName, String loginName)throws Exception {
+        Long result=null;
+        try{
+            result=userMapperEx.countsByUser(userName, loginName);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     * 添加事务控制
+     * create time: 2019/1/11 14:30
+     * @Param: beanJson
+     * @Param: request
+     * @return int
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int insertUser(JSONObject obj, HttpServletRequest request)throws Exception {
+        User user = JSONObject.parseObject(obj.toJSONString(), User.class);
+        String password = "123456";
+        //因密码用MD5加密，需要对密码进行转化
+        try {
+            password = Tools.md5Encryp(password);
+            user.setPassword(password);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            logger.error(">>>>>>>>>>>>>>转化MD5字符串错误 ：" + e.getMessage());
+        }
+        int result=0;
+        try{
+            result=userMapper.insertSelective(user);
+            logService.insertLog("用户",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(user.getLoginName()).toString(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     * 添加事务控制
+     * create time: 2019/1/11 14:31
+     * @Param: beanJson
+     * @Param: id
+     * @return int
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateUser(JSONObject obj, HttpServletRequest request) throws Exception{
+        User user = JSONObject.parseObject(obj.toJSONString(), User.class);
+        int result=0;
+        try{
+            result=userMapper.updateByPrimaryKeySelective(user);
+            logService.insertLog("用户",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(user.getLoginName()).toString(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     * 添加事务控制
+     * create time: 2019/1/11 14:32
+     * @Param: user
+     * @return int
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateUserByObj(User user) throws Exception{
+        logService.insertLog("用户",
+                new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(user.getId()).toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        int result=0;
+        try{
+            result=userMapper.updateByPrimaryKeySelective(user);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  添加事务控制
+     * create time: 2019/1/11 14:33
+     * @Param: md5Pwd
+     * @Param: id
+     * @return int
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int resetPwd(String md5Pwd, Long id) throws Exception{
+        int result=0;
+        logService.insertLog("用户",
+                new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        User u = getUser(id);
+        String loginName = u.getLoginName();
+        if("admin".equals(loginName)){
+            logger.info("禁止重置超管密码");
+        } else {
+            User user = new User();
+            user.setId(id);
+            user.setPassword(md5Pwd);
+            try{
+                result=userMapper.updateByPrimaryKeySelective(user);
+            }catch(Exception e){
+                JshException.writeFail(logger, e);
+            }
+        }
+        return result;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int deleteUser(Long id, HttpServletRequest request)throws Exception {
+        return batDeleteUser(id.toString());
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteUser(String ids, HttpServletRequest request)throws Exception {
+        return batDeleteUser(ids);
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batDeleteUser(String ids) throws Exception{
+        int result=0;
+        StringBuffer sb = new StringBuffer();
+        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
+        List<User> list = getUserListByIds(ids);
+        for(User user: list){
+            sb.append("[").append(user.getLoginName()).append("]");
+        }
+        logService.insertLog("用户", sb.toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        String idsArray[]=ids.split(",");
+        try{
+            result=userMapperEx.batDeleteOrUpdateUser(idsArray,BusinessConstants.USER_STATUS_DELETE);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        if(result<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]",
+                    ExceptionConstants.USER_DELETE_FAILED_CODE,ExceptionConstants.USER_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.USER_DELETE_FAILED_CODE,
+                    ExceptionConstants.USER_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
+
+    public int validateUser(String loginName, String password) throws Exception {
+        /**默认是可以登录的*/
+        List<User> list = null;
+        try {
+            UserExample example = new UserExample();
+            example.createCriteria().andLoginNameEqualTo(loginName);
+            list = userMapper.selectByExample(example);
+            if (null != list && list.size() == 0) {
+                return ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST;
+            } else if(list.size() ==1) {
+                if(list.get(0).getStatus()!=0) {
+                    return ExceptionCodeConstants.UserExceptionCode.BLACK_USER;
+                }
+            }
+        } catch (Exception e) {
+            logger.error(">>>>>>>>访问验证用户姓名是否存在后台信息异常", e);
+            return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION;
+        }
+        try {
+            UserExample example = new UserExample();
+            example.createCriteria().andLoginNameEqualTo(loginName).andPasswordEqualTo(password)
+                    .andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+            list = userMapper.selectByExample(example);
+            if (null != list && list.size() == 0) {
+                return ExceptionCodeConstants.UserExceptionCode.USER_PASSWORD_ERROR;
+            }
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>访问验证用户密码后台信息异常", e);
+            return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION;
+        }
+        return ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT;
+    }
+
+    public User getUserByLoginName(String loginName)throws Exception {
+        UserExample example = new UserExample();
+        example.createCriteria().andLoginNameEqualTo(loginName).andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+        List<User> list=null;
+        try{
+            list= userMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        User user =null;
+        if(list!=null&&list.size()>0){
+            user = list.get(0);
+        }
+        return user;
+    }
+
+    public int checkIsNameExist(Long id, String name)throws Exception {
+        UserExample example = new UserExample();
+        List <Byte> userStatus=new ArrayList<Byte>();
+        userStatus.add(BusinessConstants.USER_STATUS_DELETE);
+        userStatus.add(BusinessConstants.USER_STATUS_BANNED);
+        example.createCriteria().andIdNotEqualTo(id).andLoginNameEqualTo(name).andStatusNotIn(userStatus);
+        List<User> list=null;
+        try{
+            list= userMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list==null?0:list.size();
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  获取当前用户信息
+     * create time: 2019/1/24 10:01
+     * @Param:
+     * @return com.jsh.erp.datasource.entities.User
+     */
+    public User getCurrentUser()throws Exception{
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        Long userId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"userId").toString());
+        return getUser(userId);
+    }
+
+    /**
+     * 检查当前用户是否是演示用户
+     * @return
+     */
+    public Boolean checkIsTestUser() throws Exception{
+        Boolean result = false;
+        try {
+            if (demonstrateOpen) {
+                User user = getCurrentUser();
+                if (TEST_USER.equals(user.getLoginName())) {
+                    result = true;
+                }
+            }
+        } catch (Exception e) {
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+
+    /**
+     * 根据用户名查询id
+     * @param loginName
+     * @return
+     */
+    public Long getIdByLoginName(String loginName) {
+        Long userId = 0L;
+        UserExample example = new UserExample();
+        example.createCriteria().andLoginNameEqualTo(loginName).andStatusEqualTo(BusinessConstants.USER_STATUS_NORMAL);
+        List<User> list = userMapper.selectByExample(example);
+        if(list!=null) {
+            userId = list.get(0).getId();
+        }
+        return userId;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public void addUserAndOrgUserRel(UserEx ue) throws Exception{
+        if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginName())) {
+            throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
+                    ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
+        } else {
+            logService.insertLog("用户",
+                    BusinessConstants.LOG_OPERATION_TYPE_ADD,
+                    ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+            //检查用户名和登录名
+            checkUserNameAndLoginName(ue);
+            //新增用户信息
+            ue= this.addUser(ue);
+            if(ue==null){
+                logger.error("异常码[{}],异常提示[{}],参数,[{}]",
+                        ExceptionConstants.USER_ADD_FAILED_CODE,ExceptionConstants.USER_ADD_FAILED_MSG);
+                throw new BusinessRunTimeException(ExceptionConstants.USER_ADD_FAILED_CODE,
+                        ExceptionConstants.USER_ADD_FAILED_MSG);
+            }
+            //用户id，根据用户名查询id
+            Long userId = getIdByLoginName(ue.getLoginName());
+            if(ue.getRoleId()!=null){
+                JSONObject ubObj = new JSONObject();
+                ubObj.put("type", "UserRole");
+                ubObj.put("keyid", userId);
+                ubObj.put("value", "[" + ue.getRoleId() + "]");
+                userBusinessService.insertUserBusiness(ubObj, null);
+            }
+            if(ue.getOrgaId()==null){
+                //如果没有选择机构，就不建机构和用户的关联关系
+                return;
+            }
+            //新增用户和机构关联关系
+            OrgaUserRel oul=new OrgaUserRel();
+            //机构id
+            oul.setOrgaId(ue.getOrgaId());
+            oul.setUserId(userId);
+            //用户在机构中的排序
+            oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());
+            oul=orgaUserRelService.addOrgaUserRel(oul);
+            if(oul==null){
+                logger.error("异常码[{}],异常提示[{}],参数,[{}]",
+                        ExceptionConstants.ORGA_USER_REL_ADD_FAILED_CODE,ExceptionConstants.ORGA_USER_REL_ADD_FAILED_MSG);
+                throw new BusinessRunTimeException(ExceptionConstants.ORGA_USER_REL_ADD_FAILED_CODE,
+                        ExceptionConstants.ORGA_USER_REL_ADD_FAILED_MSG);
+            }
+        }
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public UserEx addUser(UserEx ue) throws Exception{
+        /**
+         * 新增用户默认设置
+         * 1、密码默认123456
+         * 2是否系统自带默认为非系统自带
+         * 3是否管理者默认为员工
+         * 4默认用户状态为正常
+         * */
+        ue.setPassword(Tools.md5Encryp(BusinessConstants.USER_DEFAULT_PASSWORD));
+        ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
+        if(ue.getIsmanager()==null){
+            ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
+        }
+        ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
+        int result=0;
+        try{
+            result= userMapper.insertSelective(ue);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        if(result>0){
+            return ue;
+        }
+        return null;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public UserEx registerUser(UserEx ue, Integer manageRoleId, HttpServletRequest request) throws Exception{
+        /**
+         * create by: qiankunpingtai
+         * create time: 2019/4/9 18:00
+         * 多次创建事务，事物之间无法协同，应该在入口处创建一个事务以做协调
+         */
+        if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginName())) {
+            throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
+                    ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
+        } else {
+            ue.setPassword(Tools.md5Encryp(ue.getPassword()));
+            ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
+            if (ue.getIsmanager() == null) {
+                ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
+            }
+            ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
+            int result=0;
+            try{
+                result= userMapper.insertSelective(ue);
+                Long userId = getIdByLoginName(ue.getLoginName());
+                ue.setId(userId);
+            }catch(Exception e){
+                JshException.writeFail(logger, e);
+            }
+            //更新租户id
+            User user = new User();
+            user.setId(ue.getId());
+            user.setTenantId(ue.getId());
+            userService.updateUserTenant(user);
+            //新增用户与角色的关系
+            JSONObject ubObj = new JSONObject();
+            ubObj.put("type", "UserRole");
+            ubObj.put("keyid", ue.getId());
+            JSONArray ubArr = new JSONArray();
+            ubArr.add(manageRoleId);
+            ubObj.put("value", ubArr.toString());
+            userBusinessService.insertUserBusiness(ubObj, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+            //创建租户信息
+            JSONObject tenantObj = new JSONObject();
+            tenantObj.put("tenantId", ue.getId());
+            tenantObj.put("loginName",ue.getLoginName());
+            tenantService.insertTenant(tenantObj, request);
+            logger.info("===============创建租户信息完成===============");
+            if (result > 0) {
+                return ue;
+            }
+            return null;
+        }
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public void updateUserTenant(User user) throws Exception{
+        UserExample example = new UserExample();
+        example.createCriteria().andIdEqualTo(user.getId());
+        try{
+            userMapper.updateByPrimaryKeySelective(user);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public void updateUserAndOrgUserRel(UserEx ue) throws Exception{
+        if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginName())) {
+            throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
+                    ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
+        } else {
+            logService.insertLog("用户",
+                    new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(),
+                    ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+            //检查用户名和登录名
+            checkUserNameAndLoginName(ue);
+            //更新用户信息
+            ue = this.updateUser(ue);
+            if (ue == null) {
+                logger.error("异常码[{}],异常提示[{}],参数,[{}]",
+                        ExceptionConstants.USER_EDIT_FAILED_CODE, ExceptionConstants.USER_EDIT_FAILED_MSG);
+                throw new BusinessRunTimeException(ExceptionConstants.USER_EDIT_FAILED_CODE,
+                        ExceptionConstants.USER_EDIT_FAILED_MSG);
+            }
+            if(ue.getRoleId()!=null){
+                JSONObject ubObj = new JSONObject();
+                ubObj.put("type", "UserRole");
+                ubObj.put("keyid", ue.getId());
+                ubObj.put("value", "[" + ue.getRoleId() + "]");
+                Long ubId = userBusinessService.checkIsValueExist("UserRole", ue.getId().toString());
+                if(ubId!=null) {
+                    ubObj.put("id", ubId);
+                    userBusinessService.updateUserBusiness(ubObj, null);
+                } else {
+                    userBusinessService.insertUserBusiness(ubObj, null);
+                }
+            }
+            if (ue.getOrgaId() == null) {
+                //如果没有选择机构，就不建机构和用户的关联关系
+                return;
+            }
+            //更新用户和机构关联关系
+            OrgaUserRel oul = new OrgaUserRel();
+            //机构和用户关联关系id
+            oul.setId(ue.getOrgaUserRelId());
+            //机构id
+            oul.setOrgaId(ue.getOrgaId());
+            //用户id
+            oul.setUserId(ue.getId());
+            //用户在机构中的排序
+            oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());
+            if (oul.getId() != null) {
+                //已存在机构和用户的关联关系，更新
+                oul = orgaUserRelService.updateOrgaUserRel(oul);
+            } else {
+                //不存在机构和用户的关联关系，新建
+                oul = orgaUserRelService.addOrgaUserRel(oul);
+            }
+            if (oul == null) {
+                logger.error("异常码[{}],异常提示[{}],参数,[{}]",
+                        ExceptionConstants.ORGA_USER_REL_EDIT_FAILED_CODE, ExceptionConstants.ORGA_USER_REL_EDIT_FAILED_MSG);
+                throw new BusinessRunTimeException(ExceptionConstants.ORGA_USER_REL_EDIT_FAILED_CODE,
+                        ExceptionConstants.ORGA_USER_REL_EDIT_FAILED_MSG);
+            }
+        }
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public UserEx updateUser(UserEx ue)throws Exception{
+        int result =0;
+        try{
+            result=userMapper.updateByPrimaryKeySelective(ue);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        if(result>0){
+            return ue;
+        }
+        return null;
+    }
+    /**
+     * create by: cjl
+     * description:
+     *  检查用户名称和登录名不能重复
+     * create time: 2019/3/12 11:36
+     * @Param: userEx
+     * @return void
+     */
+    public void checkUserNameAndLoginName(UserEx userEx)throws Exception{
+        List<User> list=null;
+        if(userEx==null){
+            return;
+        }
+        Long userId=userEx.getId();
+        //检查登录名
+        if(!StringUtils.isEmpty(userEx.getLoginName())){
+            String loginName=userEx.getLoginName();
+            list=this.getUserListByloginName(loginName);
+            if(list!=null&&list.size()>0){
+                if(list.size()>1){
+                    //超过一条数据存在，该登录名已存在
+                    logger.error("异常码[{}],异常提示[{}],参数,loginName:[{}]",
+                            ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_CODE,ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_MSG,loginName);
+                    throw new BusinessRunTimeException(ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_CODE,
+                            ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_MSG);
+                }
+                //一条数据，新增时抛出异常，修改时和当前的id不同时抛出异常
+                if(list.size()==1){
+                    if(userId==null||(userId!=null&&!userId.equals(list.get(0).getId()))){
+                        logger.error("异常码[{}],异常提示[{}],参数,loginName:[{}]",
+                                ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_CODE,ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_MSG,loginName);
+                        throw new BusinessRunTimeException(ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_CODE,
+                                ExceptionConstants.USER_LOGIN_NAME_ALREADY_EXISTS_MSG);
+                    }
+                }
+
+            }
+        }
+        //检查用户名
+        if(!StringUtils.isEmpty(userEx.getUsername())){
+            String userName=userEx.getUsername();
+            list=this.getUserListByUserName(userName);
+            if(list!=null&&list.size()>0){
+                if(list.size()>1){
+                    //超过一条数据存在，该用户名已存在
+                    logger.error("异常码[{}],异常提示[{}],参数,userName:[{}]",
+                            ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_CODE,ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_MSG,userName);
+                    throw new BusinessRunTimeException(ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_CODE,
+                            ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_MSG);
+                }
+                //一条数据，新增时抛出异常，修改时和当前的id不同时抛出异常
+                if(list.size()==1){
+                    if(userId==null||(userId!=null&&!userId.equals(list.get(0).getId()))){
+                        logger.error("异常码[{}],异常提示[{}],参数,userName:[{}]",
+                                ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_CODE,ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_MSG,userName);
+                        throw new BusinessRunTimeException(ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_CODE,
+                                ExceptionConstants.USER_USER_NAME_ALREADY_EXISTS_MSG);
+                    }
+                }
+
+            }
+        }
+
+    }
+    /**
+     * 通过用户名获取用户列表
+     * */
+    public List<User> getUserListByUserName(String userName)throws Exception{
+        List<User> list =null;
+        try{
+            list=userMapperEx.getUserListByUserNameOrLoginName(userName,null);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+    /**
+     * 通过登录名获取用户列表
+     * */
+    public List<User> getUserListByloginName(String loginName){
+        List<User> list =null;
+        try{
+            list=userMapperEx.getUserListByUserNameOrLoginName(null,loginName);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<TreeNodeEx> getOrganizationUserTree()throws Exception {
+        List<TreeNodeEx> list =null;
+        try{
+            list=userMapperEx.getNodeTree();
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    /**
+     * 根据用户id查询角色类型
+     * @param userId
+     * @return
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public String getRoleTypeByUserId(long userId) throws Exception {
+        List<UserBusiness> list = userBusinessService.getBasicData(String.valueOf(userId), "UserRole");
+        UserBusiness ub = null;
+        if(list.size() > 0) {
+            ub = list.get(0);
+            String values = ub.getValue();
+            String roleId = null;
+            if(values!=null) {
+                values = values.replaceAll("\\[\\]",",").replace("[","").replace("]","");
+            }
+            String [] valueArray=values.split(",");
+            if(valueArray.length>0) {
+                roleId = valueArray[0];
+            }
+            Role role = roleService.getRole(Long.parseLong(roleId));
+            if(role!=null) {
+                return role.getType();
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 获取用户id
+     * @param request
+     * @return
+     */
+    public Long getUserId(HttpServletRequest request) throws Exception{
+        Object userIdObj = redisService.getObjectFromSessionByKey(request,"userId");
+        Long userId = null;
+        if(userIdObj != null) {
+            userId = Long.parseLong(userIdObj.toString());
+        }
+        return userId;
+    }
+}