修改根据业务查询部门逻辑

base-manager/src/main/java/com/mortals/xhx/base/framework/filter/RequestFilter.java

@@ -6,53 +6,45 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * 
  * 请求过滤链
+ *
  * @author: zxfei
  * @date: 2022/4/20 14:52
  */
-//@Component
+@WebFilter(urlPatterns = "/*")
 @Slf4j
-public class RequestFilter extends OncePerRequestFilter implements Filter {
+public class RequestFilter implements Filter {
+    private static final String FORM_CONTENT_TYPE = "multipart/form-data";
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        try {
-            request = new ContentCachingRequestWrapper(request);
-            filterChain.doFilter(request, response);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            //清理ThreadLocal
-            MDC.clear();
+    public void init(FilterConfig filterConfig) {
     }
-    }
-
 
-    /*private void setUsername(HttpServletRequest request) {
-        //通过token解析出username
-        String token = authTokenService.getToken(request);
-        //String token = request.getHeader("token");
-        if (!ObjectUtils.isEmpty(token)) {
-            MDC.put("token",token);
-            MDC.put("token", token);
-            try {
-                SessionUserInfo info = tokenService.getUserInfo();
-                if (info != null) {
-                    String username = info.getUsername();
-                    MDC.put("username", username);
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response,
+                         FilterChain chain) throws IOException, ServletException {
+        String contentType = request.getContentType();
+        if (request instanceof HttpServletRequest) {
+            HttpServletRequest requestWrapper = new ContentCachingRequestWrapper((HttpServletRequest) request);
+            // #1
+            if (contentType != null && contentType.contains(FORM_CONTENT_TYPE)) {
+                chain.doFilter(request, response);
+            } else {
+                chain.doFilter(requestWrapper, response);
+            }
+            return;
         }
-            } catch (CommonJsonException e) {
-                log.info("无效的token:{}", token);
+        chain.doFilter(request, response);
     }
+
+    @Override
+    public void destroy() {
     }
-    }*/
 }

base-manager/src/main/java/com/mortals/xhx/module/sms/service/impl/SmsSetServiceImpl.java

@@ -22,6 +22,17 @@ import java.util.stream.Collectors;
 @Service("smsSetService")
 public class SmsSetServiceImpl extends AbstractCRUDCacheServiceImpl<SmsSetDao, SmsSetEntity, Long> implements SmsSetService {
 
+
+    /**
+     * @param key
+     * @param data
+     */
+    @Override
+    public void putCache(String key, SmsSetEntity data) {
+        key=data.getSiteId().toString();
+        super.putCache(key, data);
+    }
+
     @Override
     public List<SmsSetEntity> find(SmsSetEntity entity) throws AppException {
         List<SmsSetEntity> cacheList = this.getCacheList();

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowMatterServiceImpl.java

@@ -6,6 +6,8 @@ import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.HttpUtil;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.window.model.WindowMatterQuery;
@@ -38,6 +40,25 @@ public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatte
 
     @Autowired
     private MatterService matterService;
+    @Autowired
+    private DeptService deptService;
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveBefore(WindowMatterEntity entity, Context context) throws AppException {
+        super.saveBefore(entity, context);
+        if (!ObjectUtils.isEmpty(entity.getDeptId())) {
+            DeptEntity cache = deptService.getCache(entity.getDeptId().toString());
+            if (ObjectUtils.isEmpty(entity.getDeptCode())) {
+                entity.setDeptCode(cache == null ? "" : cache.getDeptNumber());
+            }
+        }
+    }
 
     /**
      * @param entity
@@ -57,9 +78,9 @@ public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatte
      */
     @Override
     protected void removeBefore(Long id, Context context) throws AppException {
+        super.removeBefore(id, context);
         WindowMatterEntity windowMatterEntity = this.get(id, context);
         pushChangeMsg(windowMatterEntity);
-        super.removeBefore(id, context);
     }
 
     /**
@@ -69,11 +90,11 @@ public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatte
      */
     @Override
     protected void removeBefore(Long[] ids, Context context) throws AppException {
+        super.removeBefore(ids, context);
         Arrays.asList(ids).forEach(id -> {
             WindowMatterEntity windowMatterEntity = this.get(id, context);
             pushChangeMsg(windowMatterEntity);
         });
-        super.removeBefore(ids, context);
     }
 
     /**
@@ -108,13 +129,13 @@ public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatte
     protected void updateBefore(WindowMatterEntity entity, Context context) throws AppException {
         super.updateBefore(entity, context);
         WindowMatterEntity beforeWindowMatterEntity = this.get(entity.getId(), context);
-        if(!ObjectUtils.isEmpty(beforeWindowMatterEntity.getDeptCode())&&!beforeWindowMatterEntity.getDeptCode().equals(entity.getDeptCode())){
+        if (!ObjectUtils.isEmpty(beforeWindowMatterEntity.getDeptCode()) && !beforeWindowMatterEntity.getDeptCode().equals(entity.getDeptCode())) {
             //更新
             MatterEntity matterEntity = matterService.get(entity.getSiteMatterId());
-            if(!ObjectUtils.isEmpty(matterEntity)){
+            if (!ObjectUtils.isEmpty(matterEntity)) {
                 matterEntity.setDeptCode(entity.getDeptCode());
                 matterEntity.setDeptName(entity.getDeptName());
-                matterService.update(matterEntity,context);
+                matterService.update(matterEntity, context);
             }
         }
     }
@@ -126,8 +147,8 @@ public class WindowMatterServiceImpl extends AbstractCRUDServiceImpl<WindowMatte
      */
     @Override
     protected void updateAfter(WindowMatterEntity entity, Context context) throws AppException {
-        pushChangeMsg(entity);
         super.updateAfter(entity, context);
+        pushChangeMsg(entity);
     }
 
     private void pushChangeMsg(WindowMatterEntity entity) {