|
|
@@ -206,9 +206,8 @@ public class AdminApiController extends BaseApiController {
|
|
|
}
|
|
|
if (StringUtils.isBlank(userIdentity.getId())){
|
|
|
userIdentity.setId(UUID.randomUUID().toString());
|
|
|
- userIdentity.setAuditStatus(0);
|
|
|
- userIdentity.setProcess(0);
|
|
|
- userIdentity.setWrongCount(0);
|
|
|
+ userIdentity.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
|
|
|
+ userIdentity.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
|
|
|
res.setData(userIdentityService.insert(userIdentity));
|
|
|
} else {
|
|
|
res.setData(userIdentityService.updateUserDetail(userIdentity));
|
|
|
@@ -275,12 +274,11 @@ public class AdminApiController extends BaseApiController {
|
|
|
}
|
|
|
if (StringUtils.isBlank(orgIdentity.getId())){
|
|
|
orgIdentity.setId(UUID.randomUUID().toString());
|
|
|
- orgIdentity.setIdentityType(0);
|
|
|
- orgIdentity.setAuditStatus(0);
|
|
|
- orgIdentity.setProcess(0);
|
|
|
- orgIdentity.setWrongCount(0);
|
|
|
- orgIdentity.setListed(0);
|
|
|
- orgIdentity.setListedType(0);
|
|
|
+ orgIdentity.setIdentityType(null == orgIdentity.getIdentityType() ? 0 : orgIdentity.getIdentityType());
|
|
|
+ orgIdentity.setAuditStatus(null == orgIdentity.getAuditStatus() ? 0 : orgIdentity.getAuditStatus());
|
|
|
+ orgIdentity.setProcess(null == orgIdentity.getProcess() ? 0 : orgIdentity.getProcess());
|
|
|
+ orgIdentity.setListed(null == orgIdentity.getListed() ? 0 : orgIdentity.getListed());
|
|
|
+ orgIdentity.setListedType(null == orgIdentity.getListedType() ? 0 : orgIdentity.getListedType());
|
|
|
res.setData(organizationIdentityService.insert(orgIdentity));
|
|
|
} else {
|
|
|
res.setData(organizationIdentityService.updateOrgDetail(orgIdentity));
|
|
|
@@ -601,7 +599,6 @@ public class AdminApiController extends BaseApiController {
|
|
|
orgActivityCost.setStartDate(ac.getStartDate());
|
|
|
orgActivityCost.setEndDate(ac.getEndDate());
|
|
|
orgActivityCost.setId(UUID.randomUUID().toString());
|
|
|
- orgActivityCost.setUid(TokenManager.getUserId());
|
|
|
orgActivityCost.setDeletedSign(0);
|
|
|
orgActivityCostService.insert(orgActivityCost);
|
|
|
} else {
|
|
|
@@ -1144,7 +1141,7 @@ public class AdminApiController extends BaseApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
|
|
|
- public Result cultivationList(String province, String uid, String pageNo, String pageSize){
|
|
|
+ public Result cultivationList(String province, String unitName, String pageNo, String pageSize){
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -1154,7 +1151,7 @@ public class AdminApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(orgCognizanceService.listCultivation(province, uid, pNo, pSize));
|
|
|
+ res.setData(orgCognizanceService.listCultivation(province, unitName, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
|