|
@@ -129,6 +129,7 @@ import com.goafanti.user.bo.InputUser;
|
|
|
import com.goafanti.user.bo.InputUserAbility;
|
|
import com.goafanti.user.bo.InputUserAbility;
|
|
|
import com.goafanti.user.bo.InputUserIdentity;
|
|
import com.goafanti.user.bo.InputUserIdentity;
|
|
|
import com.goafanti.user.bo.OrgListBo;
|
|
import com.goafanti.user.bo.OrgListBo;
|
|
|
|
|
+import com.goafanti.user.bo.OrgUnitNames;
|
|
|
import com.goafanti.user.bo.UserListBo;
|
|
import com.goafanti.user.bo.UserListBo;
|
|
|
import com.goafanti.user.service.OrgHumanResourceService;
|
|
import com.goafanti.user.service.OrgHumanResourceService;
|
|
|
import com.goafanti.user.service.OrganizationIdentityService;
|
|
import com.goafanti.user.service.OrganizationIdentityService;
|
|
@@ -2884,9 +2885,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
|
|
|
public Result getUnitNames() {
|
|
public Result getUnitNames() {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
- List<OrganizationIdentity> list = organizationIdentityService.selectAllOrgIndentity();
|
|
|
|
|
|
|
+ List<OrgUnitNames> list = organizationIdentityService.selectAllOrgIndentity();
|
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
|
- for (OrganizationIdentity o : list) {
|
|
|
|
|
|
|
+ for (OrgUnitNames o : list) {
|
|
|
map.put(o.getUid(), o.getUnitName());
|
|
map.put(o.getUid(), o.getUnitName());
|
|
|
}
|
|
}
|
|
|
res.setData(map);
|
|
res.setData(map);
|