|
|
@@ -183,9 +183,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
private CopyrightInfoService copyrightInfoService;
|
|
|
@Resource
|
|
|
private OrgCognizanceProportionService orgCognizanceProportionService;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Value(value = "${wx.appId}")
|
|
|
private String appId;
|
|
|
@Value(value = "${wx.appSecret}")
|
|
|
@@ -343,7 +343,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 新增用户
|
|
|
@@ -726,7 +726,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 删除团体人力资源
|
|
|
- *
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/deleteHumanResource", method = RequestMethod.POST)
|
|
|
@@ -1568,7 +1568,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 删除企业年度研究开发费用结构明细记录
|
|
|
- *
|
|
|
+ *
|
|
|
* @param ids
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2619,8 +2619,8 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(disposeCognizanceStatus());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 高企认定流转状态
|
|
|
*/
|
|
|
@@ -2991,7 +2991,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 角色列表
|
|
|
*/
|
|
|
@@ -3032,9 +3032,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
* 常用联系人列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/frequentContactsList", method = RequestMethod.GET)
|
|
|
- public Result frequentContactsList(String departmentId,String name,String roleName,Integer pageSize,Integer pageNo) {
|
|
|
+ public Result frequentContactsList(String deps,String name,String roleName,Integer pageSize,Integer pageNo) {
|
|
|
Result res = new Result();
|
|
|
- res.setData(adminService.frequentContactsList(departmentId, name,roleName, pageSize, pageNo));
|
|
|
+ res.setData(adminService.frequentContactsList(deps, name,roleName, pageSize, pageNo));
|
|
|
return res;
|
|
|
}
|
|
|
/**
|
|
|
@@ -3069,5 +3069,5 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|