update bug

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineUserService.java

@@ -220,7 +220,7 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
            if (!StringUtils.isEmpty(userId)) {
                //全部设备
                if(isAll) {
                    UserDO user = userDao.findOne(operator);
                    UserDO user = userDao.findOne(userId);
                    RoleDO role = roleDao.findOne(user.getRoleId());
                    if (role==null){
                        throw new Exception("角色为空!");
@@ -260,6 +260,16 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                                    "t.user_id = '" + userId + "'\n" +
                                    "AND t.del = 1";
                        }
                        //设备管理员
                        if ("replenisher".equals(role.getCode())) {
                            tempSql = "SELECT\n" +
                                    "t.hospital AS community\n" +
                                    "FROM\n" +
                                    "wlyy_user_area AS t\n" +
                                    "WHERE\n" +
                                    "t.user_id = '" + userId + "'\n" +
                                    "AND t.del = 1";
                        }
                        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(tempSql);
                        for (Map<String, Object> stringObjectMap : list) {
                            if (stringObjectMap.get("community") != null && !StringUtils.isEmpty(stringObjectMap.get("community").toString())) {

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -5671,8 +5671,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
                ids +="'"+mediicinedevice.getEquNum()+"',";
            }
            ids = ids.substring(0,ids.length()-1);
            condition  = " AND o.shipping_equ IN ("+ids+")";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
                ids = ids.substring(0,ids.length()-1);
                condition  = " AND o.shipping_equ IN ("+ids+")";
            }
        } else {
            String belongCommunitys = "";
            String tempSql = "";
@@ -5829,8 +5832,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
                ids +="'"+mediicinedevice.getEquNum()+"',";
            }
            ids = ids.substring(0,ids.length()-1);
            condition  = " AND o.shipping_equ IN ("+ids+")";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
                ids = ids.substring(0,ids.length()-1);
                condition  = " AND o.shipping_equ IN ("+ids+")";
            }
        } else {
            String belongCommunitys = "";
            String tempSql = "";
@@ -5953,8 +5959,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
                ids +="'"+mediicinedevice.getEquNum()+"',";
            }
            ids = ids.substring(0,ids.length()-1);
            condition  = " AND o.shipping_equ IN ("+ids+")";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
                ids = ids.substring(0,ids.length()-1);
                condition  = " AND o.shipping_equ IN ("+ids+")";
            }
        } else {
            String belongCommunitys = "";
            String tempSql = "";