diff --git a/src/main/java/cokr/xit/fims/mngt/FactionUtil.java b/src/main/java/cokr/xit/fims/mngt/FactionUtil.java index 4cf1512a..ff389319 100644 --- a/src/main/java/cokr/xit/fims/mngt/FactionUtil.java +++ b/src/main/java/cokr/xit/fims/mngt/FactionUtil.java @@ -7,14 +7,35 @@ public class FactionUtil { return splitString[splitString.length-1]; } - public static String getInstituteLeader(String instNm, boolean jang) { - if(instNm.endsWith("구") || instNm.endsWith("군")) { - instNm += "청"; - } - if(jang) { - instNm += "장"; + public static String getInstituteLeader(String instNm, boolean person) { + String result = ""; + + if(person) { + if(instNm.endsWith("시청") || instNm.endsWith("군청")) { + result = instNm.substring(0, instNm.length()-1); + } else if(instNm.endsWith("구")) { + result = instNm+"청"; + } else { + result = instNm; + } + + if(result.endsWith("군")){ + result += "수"; + } else { + result += "장"; + } + + } else { + + if(instNm.endsWith("시") || instNm.endsWith("군") || instNm.endsWith("구")) { + result = instNm+"청"; + } else { + result = instNm; + } + } - return instNm; + + return result; } }