java/QianYunTong.git

			@@ -5,6 +5,7 @@
			import com.stylefeng.guns.config.properties.GunsProperties;
			import com.stylefeng.guns.core.base.controller.BaseController;
			import com.stylefeng.guns.core.base.tips.Tip;
			import com.stylefeng.guns.core.beetl.ShiroExtUtil;
			import com.stylefeng.guns.core.common.annotion.BussinessLog;
			import com.stylefeng.guns.core.common.annotion.Permission;
			import com.stylefeng.guns.core.common.constant.Const;
			@@ -13,7 +14,6 @@
			import com.stylefeng.guns.core.common.constant.factory.PageFactory;
			import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
			import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
			import com.stylefeng.guns.core.datascope.DataScope;
			import com.stylefeng.guns.core.db.Db;
			import com.stylefeng.guns.core.exception.GunsException;
			import com.stylefeng.guns.core.log.LogObjectHolder;
			@@ -29,6 +29,8 @@
			import com.stylefeng.guns.modular.system.service.ITDriverService;
			import com.stylefeng.guns.modular.system.service.IUserService;
			import com.stylefeng.guns.modular.system.transfer.UserDto;
			import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			import org.springframework.ui.Model;
			@@ -40,7 +42,6 @@
			import javax.validation.Valid;
			import java.io.File;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.UUID;

			@@ -107,7 +108,6 @@
			if (ToolUtil.isEmpty(userId)) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}
			assertAuth(userId);
			User user = this.userService.selectById(userId);
			model.addAttribute(user);
			model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
			@@ -121,7 +121,7 @@
			*/
			@RequestMapping("/user_info")
			public String userInfo(Model model) {
			Integer userId = ShiroKit.getUser().getId();
			Integer userId = ShiroExtUtil.getUser().getId();
			if (ToolUtil.isEmpty(userId)) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}
			@@ -150,7 +150,7 @@
			if (!newPwd.equals(rePwd)) {
			throw new GunsException(BizExceptionEnum.TWO_PWD_NOT_MATCH);
			}
			Integer userId = ShiroKit.getUser().getId();
			Integer userId = ShiroExtUtil.getUser().getId();
			User user = userService.selectById(userId);
			String oldMd5 = ShiroKit.md5(oldPwd, user.getSalt());
			if (user.getPassword().equals(oldMd5)) {
			@@ -178,14 +178,13 @@
			beginTime = timeArray[0];
			endTime = timeArray[1];
			}
			if (ShiroKit.isAdmin()) {
			if (ShiroExtUtil.getUser().isAdmin()) {
			Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
			page.setRecords(userService.getUserListPage(page,null, name, beginTime, endTime, deptid));
			return super.packForBT(page);
			} else {
			DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
			Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
			page.setRecords(userService.getUserListPage(page,dataScope, name, beginTime, endTime, deptid));
			page.setRecords(userService.getUserListPage(page, null, name, beginTime, endTime, deptid));
			return super.packForBT(page);
			}
			}
			@@ -237,16 +236,18 @@
			if (result.hasErrors()) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}


			User oldUser = userService.selectById(user.getId());
			//调用中台接口
			GetStaffNodeRequest request = new GetStaffNodeRequest();

			if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
			EmployeeUtil.getStaffNode(request);


			if (ShiroExtUtil.getUser().isAdmin) {
			this.userService.updateById(UserFactory.editUser(user, oldUser));
			return SUCCESS_TIP;
			} else {
			assertAuth(user.getId());
			ShiroUser shiroUser = ShiroKit.getUser();
			ShiroUser shiroUser = ShiroExtUtil.getUser();
			if (shiroUser.getId().equals(user.getId())) {
			this.userService.updateById(UserFactory.editUser(user, oldUser));
			return SUCCESS_TIP;
			@@ -273,7 +274,6 @@
			}


			assertAuth(userId);
			this.userService.setStatus(userId, ManagerStatus.DELETED.getCode());
			return SUCCESS_TIP;
			}
			@@ -287,7 +287,6 @@
			if (ToolUtil.isEmpty(userId)) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}
			assertAuth(userId);
			return this.userService.selectById(userId);
			}

			@@ -302,7 +301,6 @@
			if (ToolUtil.isEmpty(userId)) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}
			assertAuth(userId);
			User user = this.userService.selectById(userId);
			user.setSalt(ShiroKit.getRandomSalt(5));
			user.setPassword(ShiroKit.md5(Const.DEFAULT_PWD, user.getSalt()));
			@@ -329,7 +327,6 @@
			if (userId.equals(Const.ADMIN_ID)) {
			throw new GunsException(BizExceptionEnum.CANT_FREEZE_ADMIN);
			}
			assertAuth(userId);
			this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());

			User user = userService.selectById(userId);
			@@ -365,7 +362,6 @@
			if (ToolUtil.isEmpty(userId)) {
			throw new GunsException(BizExceptionEnum.REQUEST_NULL);
			}
			assertAuth(userId);
			this.userService.setStatus(userId, ManagerStatus.OK.getCode());

			User user = userService.selectById(userId);
			@@ -405,7 +401,6 @@
			if (userId.equals(Const.ADMIN_ID)) {
			throw new GunsException(BizExceptionEnum.CANT_CHANGE_ADMIN);
			}
			assertAuth(userId);
			this.userService.setRoles(userId, roleIds);


			@@ -429,21 +424,5 @@
			return pictureName;
			}

			/**
			* 判断当前登录的用户是否有操作这个用户的权限
			*/
			private void assertAuth(Integer userId) {
			if (ShiroKit.isAdmin()) {
			return;
			}
			List<Integer> deptDataScope = ShiroKit.getDeptDataScope();
			User user = this.userService.selectById(userId);
			Integer deptid = user.getDeptid();
			if (deptDataScope.contains(deptid)) {
			return;
			} else {
			throw new GunsException(BizExceptionEnum.NO_PERMITION);
			}

			}
			}