|
|
@@ -8,6 +8,7 @@ import com.dySweetFishPlugin.sql.dao.TunaService;
|
|
|
import com.dySweetFishPlugin.tool.lang.ThreadFactoryWithNamePrefix;
|
|
|
import com.sdtool.business.dao.DesignDao;
|
|
|
import com.sdtool.common.api.NoSqlKeysService;
|
|
|
+import com.sdtool.common.api.PermissionService;
|
|
|
import com.sdtool.common.api.mall.DesignService;
|
|
|
import com.sdtool.common.base.BaseService;
|
|
|
import com.sdtool.common.datas.RedisKeys;
|
|
|
@@ -72,6 +73,9 @@ public class DesignServiceImpl extends BaseService implements DesignService {
|
|
|
private NoSqlKeysService keysService;
|
|
|
|
|
|
@Resource
|
|
|
+ private PermissionService permissionService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
JsonFactory jsonRootFactory;
|
|
|
|
|
|
@Resource(name = "APP_HOME")
|
|
|
@@ -825,7 +829,9 @@ public class DesignServiceImpl extends BaseService implements DesignService {
|
|
|
@Override
|
|
|
public RetResult<List<DesignOrder>> queryDesignOrders(RMap params, PageFlipper pageFlipper, String dataSourceId, long supplierCode, ERPTokenUser currentUser) {
|
|
|
//默认来说这里查的都是自己的设计单
|
|
|
- params.set("userIdentity", currentUser.getId());
|
|
|
+ int perm = permissionService.ifPermission(currentUser, "designOrder:view:all", null, dataSourceId, supplierCode);
|
|
|
+ if (perm != 1)
|
|
|
+ params.set("userIdentity", currentUser.getId());
|
|
|
|
|
|
List<DesignOrder> orderList = designDao.selectDesignOrders(params, dataSourceId, supplierCode, pageFlipper);
|
|
|
|