Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -105,14 +105,9 @@ public class FosterwxCashWorkClientController {
                     last("LIMIT 1"));
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
-            if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
-                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = null;
-                if (1 == fosterwxCashScheduleTaskList.getTaskType()) {
-                    fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
-                }
-                if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
-                    fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid()));
-                }
+            if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
+                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid()));
+
                 if (null != fosterwxCashWorkBoxClientInfo) {
                     FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
                     boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());