Antiloveg 8 years ago
parent
commit
b993c27a8a

+ 2 - 3
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -669,7 +669,6 @@ public class AdminApiController extends CertifyApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
 
 		if (null == userIdentity.getUid()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -688,7 +687,7 @@ public class AdminApiController extends CertifyApiController {
 
 		ui.setProcess(IdentityProcess.COMMITTED.getCode());
 		ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
-		
+
 		if (StringUtils.isBlank(ui.getId())) {
 			ui.setId(UUID.randomUUID().toString());
 			res.setData(userIdentityService.insertByAdmin(ui, null, null));
@@ -2933,7 +2932,7 @@ public class AdminApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectCognizancePrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName() + " " + o.getPosition());
+			map.put(o.getId(), o.getName() + " " + (null == o.getPosition() ? "" : o.getPosition()));
 		}
 		res.setData(map);
 		return res;

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

@@ -334,7 +334,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectCopyrightPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName()+ " " + o.getPosition());
+			map.put(o.getId(), o.getName()+ " " + (null == o.getPosition() ? "" : o.getPosition()));
 		}
 		res.setData(map);
 		return res;

+ 10 - 0
src/main/java/com/goafanti/admin/controller/AdminHomePageApiController.java

@@ -0,0 +1,10 @@
+package com.goafanti.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/api/admin/homePage")
+public class AdminHomePageApiController {
+
+}

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

@@ -900,7 +900,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectPatentPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName() + " " + o.getPosition());
+			map.put(o.getId(), o.getName() + " " + (null == o.getPosition() ? "" : o.getPosition()));
 		}
 		res.setData(map);
 		return res;

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

@@ -111,7 +111,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectTechprojectPrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName()+ " " + o.getPosition());
+			map.put(o.getId(), o.getName()+ " " + (null == o.getPosition() ? "" : o.getPosition()));
 		}
 		res.setData(map);
 		return res;