Antiloveg лет назад: 8
Родитель
Сommit
0cd34f0cab

+ 6 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1045,6 +1045,11 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (null == orgIntellectualProperty.getCatagory()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到类别", "类别"));
+			return res;
+		}
 		if (!checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()) {
 			return res;
 		}
@@ -1077,7 +1082,7 @@ public class AdminApiController extends CertifyApiController {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
-			oip.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
+			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
 			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
 		return res;

+ 6 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1642,6 +1642,11 @@ public class CognizanceApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "知识产权编号", "知识产权编号"));
 			return res;
 		}
+		
+		if (null == orgIntellectualProperty.getCatagory()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到类别", "类别"));
+			return res;
+		}
 
 		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
 				TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
@@ -1672,7 +1677,7 @@ public class CognizanceApiController extends CertifyApiController {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
-			oip.setEvaluationCategory(oip.getCatagory() <= 2 ? 1 : 0);
+			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
 			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
 		return res;

+ 14 - 2
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -269,6 +269,16 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			return (Pagination<OrgListBo>) findPage("findOrgListByPage", "findOrgCount", params, pageNo, pageSize);
 		} else if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
+			List<Integer> provinceList = adminLocationMapper
+					.selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
+			List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
+			provinceList.addAll(cityList);
+			if (null != provinceList && provinceList.size() > 0) {
+				params.put("provinceList", provinceList);
+			}
+			if (null != cityList && cityList.size() > 0) {
+				params.put("cityList", cityList);
+			}
 			return (Pagination<OrgListBo>) findPage("findAreaManagerOrgListByPage", "findAreaManagerOrgCount", params,
 					pageNo, pageSize);
 		}
@@ -371,7 +381,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
 			return disposeAchievementUserOwner(userIdentityMapper.selectManagerAchievementUserOwner(aid, name));
 		} else {
-			if (TokenManager.hasRole(AFTConstants.SUPERADMIN)|| TokenManager.hasRole(AFTConstants.TECHBROKER) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+			if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER)
+					|| TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 				aid = null;
 			}
 			return disposeAchievementUserOwner(userIdentityMapper.selectAchievementUserOwner(aid, name));
@@ -383,7 +394,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
 			return organizationIdentityMapper.selectManagerAchievementOrgOwner(aid, name);
 		} else {
-			if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+			if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.TECHBROKER)
+					|| TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 				aid = null;
 			}
 			return organizationIdentityMapper.selectAchievementOrgOwner(aid, name);