Browse Source

更xinjiekou ,fix bug

wangzhinan 3 năm trước cách đây
mục cha
commit
08a91879e5

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

@ -222,7 +222,14 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        for (Map<String, Object> stringObjectMap : list) {
            String countSql = " select " +
                    "     COUNT(DISTINCT (t.id)) as count " +
                    "   from " +
                    "     t_mediicine_device_user t " +
                    "  where " +
                    "  1=1 and t.del = 1 and t.user_id = '" + stringObjectMap.get("id").toString() + "'";
            stringObjectMap.put("allocatedDevice", jdbcTemplate.queryForObject(countSql, Integer.class));
            stringObjectMap.put("DeviceQty", deviceDao.countAll());
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +

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

@ -626,7 +626,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t_mediicine_user AS t where\n";
//        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and ',"+deviceId+",' LIKE CONCAT('%,',du.device_id,',%'))";
        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and du.device_id = '" + deviceId + "'";
        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and du.device_id = '" + deviceId + "')";
        sql = sql + conditionSql;