zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangzhiguo:2e98950f6fb196a60c3c8b2eb1c8015f615c8282
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:04e98b6f2e92ba70911d64e8c013402abb1d9992
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

2 Commits
2e98950f6f ... 04e98b6f2e

Author SHA1 Message Date
xiaoshi 04e98b6f2e Merge remote-tracking branch 'origin/dev' into dev 2025-07-30 14:02:01 +08:00
xiaoshi 1ecae316b3 youhua 2025-07-30 14:01:49 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
View File

@ -66,7 +66,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )}); DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )});
for (DynamicObject dynamicObject : equipmenttype) { for (DynamicObject dynamicObject : equipmenttype) {
String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number"); String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number");
if (number.isEmpty() && number!=null){ if (!number.isEmpty() && number!=null){
strings.add(number) ; strings.add(number) ;
} }
} }

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
View File

@ -42,7 +42,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )}); DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )});
for (DynamicObject dynamicObject : equipmenttype) { for (DynamicObject dynamicObject : equipmenttype) {
String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number"); String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number");
if (number.isEmpty() && number!=null){ if (!number.isEmpty() && number!=null){
strings.add(number) ; strings.add(number) ;
} }
} }