数据访问层优化

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1338,24 +1338,13 @@ public class WmsHqlPack {
 
     /**
      *  根据用户角色id列表查询数据权限信息
-     * @param roleIds
      * @return
      */
-    public static String packHqlWmsDataAuth(List<String> roleIds) {
-        StringBuffer result = new StringBuffer();
-        String data = String.join(",", roleIds);
-        HqlPack.getInPack(data,"roleCode",result);
-        getStringBuilderPack(new WmsDataAuth(), result);
-        return result.toString();
-    }
-
-    /**
-     *  根据用户角色id列表查询数据权限信息
-     * @return
-     */
-    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) {
+    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result);
+        String data = String.join(",", roleIds);
+        HqlPack.getInPackString(data, "roleCode", result);
         getStringBuilderPack(new WmsDataAuth(), result);
         return result.toString();
     }