yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据权限

Browse Source
jg-waiwang-pro
胡川虎 6 months ago
parent 0a83906b82
commit e3cdcf32a8
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File

13
jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
Unescape View File

@ -80,8 +80,9 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
// String tableName = tableInfo.getTableName();
log.info("start insert fill ....");
System.out.println(userInfo);
this.setFieldValByName("creatorUserId", userInfo.getUserId(), metaObject);
if(map.get("creatorUserId") == null || StringUtil.isEmpty(map.get("creatorUserId").toString())){
this.setFieldValByName("creatorUserId", userInfo.getUserId(), metaObject);
}
this.setFieldValByName("creatorTime", DateUtil.getNowDate(), metaObject);
this.setFieldValByName("creatorUserName", userInfo.getUserName(), metaObject);
@ -100,8 +101,12 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
if(map.get("organizeJsonId") == null || StringUtil.isEmpty(map.get("organizeJsonId").toString())){
this.setFieldValByName("organizeJsonId", organizeId, metaObject);
}
this.setFieldValByName("companyId", companyId, metaObject);
this.setFieldValByName("departmentId", userInfo.getDepartmentId(), metaObject);
if(map.get("companyId") == null || StringUtil.isEmpty(map.get("companyId").toString())){
this.setFieldValByName("companyId", companyId, metaObject);
}
if(map.get("departmentId") == null || StringUtil.isEmpty(map.get("departmentId").toString())){
this.setFieldValByName("departmentId", userInfo.getDepartmentId(), metaObject);
}
// System.out.println(userProvider.getDepartmentId(userInfo.getUserId()));
/*if (userInfo.getUserId()!=null){
this.setFieldValByName("departmentId", userProvider.getDepartmentId(userInfo.getUserId()), metaObject);

4
jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java
Unescape View File

@ -146,6 +146,8 @@ public class MyJobHandler {
inventorySnapshotEntity.setStorageAreaId(inventoryEntity.getStorageAreaId());
inventorySnapshotEntity.setBatchNumber(inventoryEntity.getBatchNumber());
inventorySnapshotEntity.setTenantId(inventoryEntity.getTenantId());
inventorySnapshotEntity.setCreatorUserId(inventoryEntity.getCreatorUserId());
inventorySnapshotEntity.setOrganizeJsonId(inventoryEntity.getOrganizeJsonId());
inventorySnapshotEntity.setCompanyId(inventoryEntity.getCompanyId());
inventorySnapshotEntity.setDepartmentId(inventoryEntity.getDepartmentId());
list.add(inventorySnapshotEntity);
@ -243,6 +245,8 @@ public class MyJobHandler {
inventorySnapshotEntity.setStorageAreaId(inventoryEntity.getStorageAreaId());
inventorySnapshotEntity.setBatchNumber(inventoryEntity.getBatchNumber());
inventorySnapshotEntity.setTenantId(inventoryEntity.getTenantId());
inventorySnapshotEntity.setCreatorUserId(inventoryEntity.getCreatorUserId());
inventorySnapshotEntity.setOrganizeJsonId(inventoryEntity.getOrganizeJsonId());
inventorySnapshotEntity.setCompanyId(inventoryEntity.getCompanyId());
inventorySnapshotEntity.setDepartmentId(inventoryEntity.getDepartmentId());
list.add(inventorySnapshotEntity);

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java
Unescape View File

@ -604,7 +604,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
return "请输入正确的数字";
}
}
if(StringUtil.isNotEmpty(form.getDemandVolumeDown())){
/*if(StringUtil.isNotEmpty(form.getDemandVolumeDown())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getDemandVolumeDown())).matches()){
return "请输入正确的需求量下限";
}
@ -620,7 +620,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
}
}else{
return "需求量上限不能为空";
}
}*/
if(StringUtil.isEmpty(form.getAccountName())){
return "账户名称不能为空";
}

6
jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
Unescape View File

@ -516,8 +516,7 @@
</el-col>
<el-col :span="8" v-if="judgeShow('collaborationStart')">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
prop="collaborationStart">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')" >
<JnpfDatePicker v-model="dataForm.collaborationStart"
@change="changeData('collaborationStart', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@ -527,8 +526,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="16" v-if="judgeShow('demandVolumeDown')">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
prop="demandVolumeDown">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
<JnpfInput v-model="dataForm.demandVolumeDown"
@change="changeData('demandVolumeDown', -1)" placeholder="请输入"
:disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable

6
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
Unescape View File

@ -514,8 +514,7 @@
</el-col>
<el-col :span="8" v-if="judgeShow('collaborationStart')">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
prop="collaborationStart">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')">
<JnpfDatePicker v-model="dataForm.collaborationStart"
@change="changeData('collaborationStart',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
@ -525,8 +524,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="16" v-if="judgeShow('demandVolumeDown')">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
prop="demandVolumeDown">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
<JnpfInput v-model="dataForm.demandVolumeDown"
@change="changeData('demandVolumeDown',-1)" placeholder="请输入"
:disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable

6
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
Unescape View File

@ -522,8 +522,7 @@
</el-col>
<el-col :span="8" v-if="judgeShow('collaborationStart')">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
prop="collaborationStart">
<jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')">
<JnpfDatePicker v-model="dataForm.collaborationStart"
@change="changeData('collaborationStart',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
@ -533,8 +532,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="16" v-if="judgeShow('demandVolumeDown')">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
prop="demandVolumeDown">
<jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
<JnpfInput v-model="dataForm.demandVolumeDown"
@change="changeData('demandVolumeDown',-1)" placeholder="请输入"
:disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable

Write Preview
Loading…
Cancel
Save