浏览代码

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 年之前
父节点
当前提交
f4f90aa389

+ 4 - 0
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -2,6 +2,7 @@ package com.goafanti.admin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.service.DepartmentService;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DepartmentMapper;
 import com.goafanti.common.dao.WorkingHoursMapper;
 import com.goafanti.common.model.Department;
@@ -123,6 +124,9 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	public List<String> comparePermissions(List<String> aDep, String deps) {
 		List<String> myAll=new ArrayList<>();
 		List<String> input=parseArray(deps);
+		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			return input;
+		}
 		for (String s : aDep) {
 			for (String in : input) {
 				if (s.equals(in))myAll.add(s);

+ 10 - 15
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -1,32 +1,27 @@
 package com.goafanti.order.service.impl;
 
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.service.DepartmentService;
-import com.goafanti.common.dao.*;
-import com.goafanti.common.model.InvoiceLog;
-import com.goafanti.order.bo.*;
-import com.goafanti.organization.bo.OrganizationListOut;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.InvoiceLog;
 import com.goafanti.common.model.TOrderInvoice;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.*;
 import com.goafanti.order.service.OrderInvoiceService;
 import com.goafanti.order.service.OrderNewService;
+import com.goafanti.organization.bo.OrganizationListOut;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
 
 
 @Service

+ 19 - 25
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -1,20 +1,5 @@
 package com.goafanti.user.controller;
 
-import java.util.Calendar;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -28,6 +13,17 @@ import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.service.UserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Calendar;
+import java.util.UUID;
 
 @Controller
 public class UserRegisterController extends BaseController {
@@ -35,13 +31,11 @@ public class UserRegisterController extends BaseController {
 	private UserService		userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
-	@Resource
-	private AdminService	adminService;
-	Logger					logger	= Logger.getLogger(UserRegisterController.class);
-	
+
+
 	/**
 	 * 网站用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -105,11 +99,11 @@ public class UserRegisterController extends BaseController {
 		}
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * APP用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -169,10 +163,10 @@ public class UserRegisterController extends BaseController {
 			us.setIdentifyName(StringUtils.isBlank(user.getUnitName())?"":user.getUnitName());
 			us.setLvl(UserLevel.GENERAL.getCode());
 			userService.insertRegister(us,user.getUnitName(),user.getUsername());
-					userService.selectByPrimaryKey(us.getId()); 			
+					userService.selectByPrimaryKey(us.getId());
 		}
 		return res;
 	}
-	
+
 
 }