Merge remote-tracking branch 'origin/main'

This commit is contained in:
dd3s_206
2026-05-16 11:15:23 +08:00
@@ -135,7 +135,7 @@ public class CommonController {
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.andEX("unit.unionId", "=", unionId); cnd.andEX("unit.unionId", "=", unionId);
cnd.and("unit.unitTypeCode", "=", "1"); cnd.and("unit.unitLevel", "=", "2");
cnd.asc("unit.unitcode"); cnd.asc("unit.unitcode");
sql.setCondition(cnd); sql.setCondition(cnd);
List<NutMap> unitList = sysUserService.listMap(sql); List<NutMap> unitList = sysUserService.listMap(sql);