dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.18

Browse Source
This commit is contained in:
sw 2024-11-18 10:54:15 +08:00
parent 5201736130
commit ef9c7611af
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/views/power/page/mode.vue
View File

@ -286,6 +286,7 @@ export default {
this.$refs[formName].validate((valid) =>{ this.$refs[formName].validate((valid) =>{
this.form.recipientRoles = this.form.recipientRoles.toString() this.form.recipientRoles = this.form.recipientRoles.toString()
this.form.conditions = JSON.stringify(this.form.conditions)
if (valid) { if (valid) {
// 表单验证通过，可以提交数据 // 表单验证通过，可以提交数据
this.open = false this.open = false
@ -294,6 +295,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.getList() this.getList()
this.open = false this.open = false
this.$modal.msgSuccess("添加成功");
} }
}) })
} else { } else {
@ -301,6 +303,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.getList() this.getList()
this.open = false this.open = false
this.$modal.msgSuccess("添加成功");
} }
}) })
} }

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java
View File

@ -324,13 +324,13 @@ public class SysNotifyServiceImpl extends ServiceImpl<SysNotifyMapper, SysNotif
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
String mm= jsonArray.get(i).toString(); String mm= jsonArray.get(i).toString();
JSONObject userObject = jsonArray.getJSONObject(i); JSONObject userObject = jsonArray.getJSONObject(i);
Integer userId=null; Integer userId=Integer.valueOf(mm);
//Integer userId = userObject.getInteger("id") //Integer userId = userObject.getInteger("id")
if(userObject.get("id")==null){ // if(mm==null){
userId=Integer.valueOf(userObject.get("staffId").toString()); // userId=Integer.valueOf(userObject.get("staffId").toString());
}else { // }else {
userId=Integer.valueOf(userObject.get("id").toString()); // userId=Integer.valueOf(userObject.get("id").toString());
} // }
// 根据 userId 查询员工信息 // 根据 userId 查询员工信息
TAccount account = tAccountMapper.selectOnes(userId); TAccount account = tAccountMapper.selectOnes(userId);