修复无法生成商品的BUG

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -20,7 +20,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     public void addInterceptors(InterceptorRegistry registry) {
         // 自定义去除的路径
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tJoinpayMchCheck/**",
-                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/sysRoleMenu/**","/tPromoCode/**","/api/**","/error"};
+                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/sysRoleMenu/**","/tEquipmentApply/**","/api/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

src/main/java/com/szwl/controller/IndexController.java

@@ -754,6 +754,9 @@ public class IndexController { ;
     @GetMapping(value = "/getPwd",  produces = "text/html;charset=utf-8")
     @ResponseBody
     public String getPwd(String clientId) {
+        if(StringUtils.isEmpty(clientId)){
+            return null;
+        }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = equipmentService.list(query);

src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -58,7 +58,7 @@ public class TEquipmentApplyController {
 
     @ApiOperation(value = "查找机器审核列表")
     @GetMapping("/pageTEquipmentApply")
-    public ResponseModel<IPage<?>> pageTEquipmentApply(String clientId, String userName,String managerId,String type, long current, long size ) {
+    public ResponseModel<IPage<?>> pageTEquipmentApply(String adminId, String clientId, String userName,String managerId,String type, long current, long size ) {
 
         LambdaQueryWrapper<TEquipmentApply> query = Wrappers.lambdaQuery();
         if(StringUtils.isNotEmpty(clientId)){
@@ -73,11 +73,12 @@ public class TEquipmentApplyController {
             }
         }
         if(StringUtils.isNotEmpty(type)){
-            query.eq(TEquipmentApply::getType,type);
+            query.eq(TEquipmentApply::getStatusType,type);
         }
         if(StringUtils.isNotEmpty(managerId)){
             query.like(TEquipmentApply::getManagerId,managerId);
         }
+        query.orderByDesc(TEquipmentApply::getCreateDate);
         Page<TEquipmentApply> page = new Page<>(current, size, true);
         IPage<TEquipmentApply> iPage = equipmentApplyService.page(page, query);
         return R.ok(iPage);
@@ -118,6 +119,8 @@ public class TEquipmentApplyController {
                             old = "1";
                             //重新修改设备名称
                             TEquipment equipment = list.get(0);
+                            equipment.setCreateDate(new Date());
+                            equipment.setModifyDate(new Date());
                             equipment.setClientId(clientId);
                             equipment.setGtClientId(gtClientId);
                             equipment.setAdminId(adminId);
@@ -161,6 +164,8 @@ public class TEquipmentApplyController {
                         }
 
                         TEquipment equipment = new TEquipment();
+                        equipment.setCreateDate(new Date());
+                        equipment.setModifyDate(new Date());
                         equipment.setClientId(clientId);
                         equipment.setManagerId(equipmentApply.getManagerId());
                         equipment.setAdminId(adminId);
@@ -249,6 +254,8 @@ public class TEquipmentApplyController {
 
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             product.setEquipmentId(id);
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
@@ -265,6 +272,8 @@ public class TEquipmentApplyController {
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
             product.setEquipmentId(id);
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
             product.setNo(split[1]);
@@ -282,6 +291,8 @@ public class TEquipmentApplyController {
 
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             product.setEquipmentId(id);
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
@@ -298,6 +309,8 @@ public class TEquipmentApplyController {
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
             product.setEquipmentId(id);
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
             product.setNo(split[1]);
@@ -312,6 +325,8 @@ public class TEquipmentApplyController {
 
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             product.setEquipmentId(id);
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
@@ -329,6 +344,8 @@ public class TEquipmentApplyController {
         for (int i = 0; i < str.length; i++) {
             TProduct product = new TProduct();
             product.setEquipmentId(id);
+            product.setModifyDate(new Date());
+            product.setCreateDate(new Date());
             String[] split = str[i].split("-");
             product.setProductName(split[0]);
             product.setNo(split[1]);