Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/params.sql

@@ -367,3 +367,5 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机',
 
 
 INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setting ', 'file/fileupload/1672810627756.svg', 'http://192.168.0.98:11071/#/jump', '基础设置平台-test', 1, '2022-04-20 09:55:59', 1, '2023-01-04 13:37:09');
+
+INSERT INTO `mortals_xhx_task` VALUES (null, '用户同步', 'syncUserTask', 0, 'SyncUserTask', NULL, NULL, 4, 120, '00', NULL, '127.0.1.1', '2023-01-13 15:41:40', 0, '2022-07-06 10:49:48', 1, '系统管理员');

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -10,7 +10,7 @@
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
         <trim suffixOverrides="where" suffix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where  a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+                where  siteId = #{condition.siteId,jdbcType=VARCHAR}
             </if>
         </trim>
          )AS b ON a.matterNo = b.matterCode
@@ -39,7 +39,7 @@
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
         <trim suffixOverrides="where" suffix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where  a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+                where  siteId = #{condition.siteId,jdbcType=VARCHAR}
             </if>
         </trim>
         ) AS b ON a.matterNo = b.matterCode

portal-manager/src/main/bin/deploy.sh

@@ -93,7 +93,7 @@ project_deploy() {
 project_ui_deploy() {
   writelog "${PROJECT_NAME}_ui_deploy"
   clear_ui_deploy ${PROJECT_UI_EXECPATH}
-  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvx ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
   writelog "${PROJECT_NAME}_ui_deploy_finish"
 
 }

portal-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java

@@ -8,13 +8,18 @@
 package com.mortals.xhx.base.system.oper.web;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
 import com.mortals.xhx.common.code.OperTypeEnum;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -53,6 +58,39 @@ public class OperLogController extends BaseCRUDJsonMappingController<OperLogServ
 		super.init(request, response, form, model, context);
 	}
 
+	@Override
+	@PostMapping({"list"})
+	@UnAuth
+	public String list(@RequestBody OperLogForm form) {
+		Map<String, Object> model = new HashMap();
+		JSONObject ret = new JSONObject();
+		Context context = this.getContext();
+		String busiDesc = "查询" + this.getModuleDesc();
+
+		int code;
+		try {
+			this.doListBefore(this.request, this.response, form, model, context);
+			Result result = this.getService().find(form.getQuery(), form.getPageInfo(), context);
+			model.put("result", result.getList());
+			model.put("pageInfo", result.getPageInfo());
+			model.put("total", result.getPageInfo().getTotalResult());
+			model.putAll(form.getModel());
+			code = this.doListAfter(this.request, this.response, form, model, context);
+			this.recordSysLog(this.request, busiDesc + " 【成功】");
+		} catch (Exception var8) {
+			code = -1;
+			this.doException(this.request, busiDesc, model, var8);
+		}
+
+		form.getModel().clear();
+		this.init(this.request, this.response, form, model, context);
+		ret.put("code", code);
+		ret.put("msg", model.remove("message_info"));
+		ret.put("query", form.getQuery());
+		ret.put("data", model);
+		return ret.toJSONString();
+	}
+
 	@Override
 	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, OperLogForm form, Map<String, Object> model, Context context) throws AppException {
 		form.getQuery().setOrderColList(new ArrayList<OrderCol>() {