Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-11-05 3b5009f4759d7ee05971b6321bbfc49eb0cf5a4b

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java

@@ -56,6 +56,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -348,6 +349,9 @@
            List<String> strings2 = Arrays.asList(halfNames.split(","));
            model.addAttribute("halfNames",strings2);
            model.addAttribute("halfName",strings2.get(0));
        }else {
            model.addAttribute("halfNames", Collections.emptyList());
            model.addAttribute("halfName", "");
        }
        // 显式传递运营商ID和是否可预约字段，确保回显正确
        model.addAttribute("operatorId", site.getOperatorId());
@@ -438,18 +442,14 @@


        String halfNames = site.getHalfName();
        ArrayList<String> strings2 = new ArrayList<>();
        String[] split = halfNames.split(",");
        String halfName=null;
        for (int i = 0; i < split.length; i++) {
            if(i==0){
                halfName = split[0];
            }else {
                strings2.add(split[i]);
            }
        if (StringUtils.isNotBlank(halfNames) && site.getIshalf().equals(1)) {
            List<String> strings2 = Arrays.asList(halfNames.split(","));
            model.addAttribute("halfNames",strings2);
            model.addAttribute("halfName",strings2.get(0));
        }else {
            model.addAttribute("halfNames", Collections.emptyList());
            model.addAttribute("halfName", "");
        }
        model.addAttribute("halfNames",strings2);
        model.addAttribute("halfName",halfName);

        List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
        model.addAttribute("list",site);