Explorar el Código

部门设置修改

anderx hace 2 años
padre
commit
72ba488ad5

+ 2 - 2
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -425,9 +425,9 @@
                d.name retrialFinanceName, a.deleted_sign as deletedSign, a.name, a.type, a.manager_id as managerId, a.dep_no as depNo,
                a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,a.hide_sign hideSign,
                a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName,
-               a.retrial_finance_id retrialFinanceId, d.name retrialFinanceName
+               a.retrial_finance_id retrialFinanceId, d.name retrialFinanceName,a.approval,a.approval_aid approvalAid,e.name approvalName
         from department a left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
-                          left join admin d on a.retrial_finance_id=d.id
+                          left join admin d on a.retrial_finance_id=d.id left join admin e on a.approval_aid =e.id
         where a.id=#{id,jdbcType=VARCHAR}
     </select>
     <delete id="deleteById" parameterType="java.lang.String">

+ 9 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -44,6 +44,7 @@ public class OrganizationListOut {
 	private String retrialFinanceName;
 	private Integer approval;
 	private String approvalAid;
+	private String approvalName;
 	private Integer province;
 	private Integer hideSign;
 	private Integer workingHoursType;
@@ -51,6 +52,14 @@ public class OrganizationListOut {
 	private Integer lvl;
 	private List<OrganizationListOut> list;
 
+	public String getApprovalName() {
+		return approvalName;
+	}
+
+	public void setApprovalName(String approvalName) {
+		this.approvalName = approvalName;
+	}
+
 	public Integer getApproval() {
 		return approval;
 	}

+ 3 - 2
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -94,7 +94,8 @@ public class AdminOrganizationController extends BaseApiController{
 	 **/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,String retrialFinanceId,
-									 String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,Integer approval,String approvalAid){
+									 String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,
+									 Integer hideSign,String depNo,Integer approval,String approvalAid){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -110,7 +111,7 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError("","部门编号已存在"));
 			return res;
 		}
-		if (approval==1&&StringUtils.isBlank(approvalAid)){
+		if (approval==null||(approval==1&&StringUtils.isBlank(approvalAid))){
 			res.getError().add(buildError("特批审核开启必须设置特批人"));
 			return res;
 		}