#

zjj

2024-06-08 5491c4c6a6f031155525e34c518d0537a90f4859

 src/main/java/com/zy/common/service/CommonService.java

@@ -147,12 +147,11 @@
            if (groupLoc) {
                String shallowLoc = Utils.getDeepLoc(slaveProperties, mast.getLocNo());
                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
                        .eq("loc_no", shallowLoc));
                if (!Cools.isEmpty(locMast2)) {
                    tmp = locMast2;

                }else {
                    tmp = mast;
                    if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
                        tmp = locMast2;
                    }
                }
            }else {
                if (!Cools.isEmpty(mast)) {