commit

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java

@@ -59,7 +59,7 @@ public class CondolenceBranchUnionApprovalController {
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
-                  ins.variable instanceVariale,
+                  ins.variable instanceVariable,
                   ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -8,6 +8,7 @@ import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
@@ -98,7 +99,13 @@ public class CondolenceMineController {
 		cnd.andEX("year(info.createTime)", "=", year);
 		cnd.andEX("info.type", "=", type);
 		cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
-		cnd.desc("info.createTime");
+
+		if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
+			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+		} else {
+			cnd.desc("info.createTime");
+		}
+
 		sql.setCondition(cnd);
 		Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java

@@ -77,6 +77,7 @@ public class CondolenceReadController {
 					ins.id AS instanceId,
 					type.name as typeName,
 					ins.state instanceState,
+					ins.processDefineId instanceProcessDefineId,
 					t.displayName taskName
 				FROM
 					condolence info

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java

@@ -61,7 +61,7 @@ public class CondolenceSchoolUnionApprovalController {
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
-                  ins.variable instanceVariale,
+                  ins.variable instanceVariable,
                   ins.processDefineId instanceProcessDefineId,
                   t.id taskId,
                   t.taskName AS taskKey,