Browse Source

Merge remote-tracking branch 'origin/master' into test

Michael 8 years ago
parent
commit
1dc679229a

+ 6 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -66,7 +66,11 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
 	public Result insertAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data) {
 		Result res = new Result();
-		JSONObject jo = (JSONObject) JSON.parse(data);
+		JSONObject jo = (JSONObject) JSON.parse(data);		
+		if (roleIds==null||roleIds.length<=0) {
+			res.getError().add(buildError("","角色不能为空"));
+			return res;
+		}
 		if (null != jo) {
 			Admin admin = jo.toJavaObject(Admin.class);
 
@@ -74,7 +78,6 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
 				return res;
 			}
-
 			if (StringUtils.isBlank(admin.getName())) {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 				return res;
@@ -85,6 +88,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 				return res;
 			}
+			
 
 			Admin ad = new Admin();
 			BeanUtils.copyProperties(admin, ad);

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -287,7 +287,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 			admin.setDistrict(" ");
 		}
 		if(admin.getHeadPortraitUrl()==null){
-			admin.setHeadPortraitUrl("0");
+			admin.setHeadPortraitUrl("");
 		}
 		return admin;
 	}

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -73,5 +73,7 @@ public interface AdminMapper {
 	String selectNameByid(String id);
 	
 	List<String>selectRolesByUid(String id);
+	
+	String selectStatusByMobile(String mobile);
 
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -109,4 +109,6 @@ public interface OrganizationManagementMapper {
 	String selectNameById(String id);
 	
 	String selectDepNoById(String id);
+	
+	int selectUserById(String id);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -524,4 +524,11 @@
   	where
   	uid=#{id,jdbcType=VARCHAR}
   </select>
+  <select id= "selectStatusByMobile" parameterType="java.lang.String" resultType="java.lang.String" >
+  	select 
+   	  status
+    from admin 
+    where 
+    mobile=#{mobile,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 7 - 0
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -562,4 +562,11 @@
 		where
 		id=#{id,jdbcType=VARCHAR}
 	</select>
+	<select id="selectUserById" parameterType="java.lang.String" resultType="java.lang.Integer">
+		select
+		count(0)
+		from admin
+		where
+		department_id=#{id,jdbcType=VARCHAR}
+	</select>
 </mapper>

+ 5 - 0
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -98,6 +98,11 @@ public class OrganizationManagementController extends BaseApiController{
 			res.getError().add(buildError("","存在下级组织不能删除"));
 			return res;
 		}
+		int adminCount=organizationManagementMapper.selectUserById(id);
+		if(adminCount>0){
+			res.getError().add(buildError("","部门被用户选定不能删除"));
+			return res;
+		}
 		organizationService.deleteById(id);
 		return res;
 	}

+ 13 - 0
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.web.util.SavedRequest;
 import org.apache.shiro.web.util.WebUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.TimeUtils;
@@ -31,6 +33,8 @@ import com.goafanti.user.service.UserService;
 public class UserLoginController extends BaseController {
 	@Resource
 	private UserService userService;
+	@Autowired
+	private AdminMapper			adminMapper;
 
 	@RequestMapping(value = "/login", method = RequestMethod.GET)
 	@ResponseBody
@@ -85,6 +89,15 @@ public class UserLoginController extends BaseController {
 	@ResponseBody
 	public Result managesignin(Admin admin, Boolean remember, HttpServletRequest request) {
 		Result res = new Result();
+		String mobile=adminMapper.selectStatusByMobile(admin.getMobile());
+		if("锁定".equals(mobile)){
+			res.getError().add(buildError("","用户已被锁定不能登录"));
+			return res;
+		}
+		if("注销".equals(mobile)){
+			res.getError().add(buildError("","用户已被注销"));
+			return res;
+		}
 		res.setData(TokenManager.manageLogin(admin, remember));
 		return res;
 	}