11.7

nickchange

2023-11-17 a9564eae9f0169ca39329b2f14a8f13d13358a0a

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

@@ -318,7 +318,7 @@
    public Object listUser(@PathVariable Integer id,Integer state) {
        try {
            Page<Object> page = new PageFactory<>().defaultPage();
            Page<CompetitionUser> data =   competitionClient.getPeopleFromId
            Page<CompetitionUser> data =  competitionClient.getPeopleFromId
                    (new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            return  super.packForBT(data);
        }catch (Exception e){
@@ -342,8 +342,9 @@

            if (UserExt.getUser().getObjectType() == 1){
                competition.setAuditStatus(2);
            }else {
            }else if (UserExt.getUser().getObjectType() == 2){
                competition.setAuditStatus(1);
                competition.setOperatorId(UserExt.getUser().getObjectId());
            }

//            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");