Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java

@@ -45,13 +45,16 @@ public class SarStandMenu extends BaseEntity {
     @TableField("VALID_FLAG")
     private Integer validFlag;
 
-    @Transient
+    @TableField(exist = false)
     private String oldMenuId;
-    @Transient
+
+    @TableField(exist = false)
     private String standType;
-    @Transient
+
+    @TableField(exist = false)
     private String[] idlist;
-    @Transient
+
+    @TableField(exist = false)
     private List<String> menuIds;
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -157,7 +157,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                 page.setAdvanceSearchStr(null);
             }
         }
-        page.setUserId(LoginUserUtil.getUserId());
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }